<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12533] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Store required plugins as an array, and an additional flag for when dependencies are not met by published WordPress.org-hosted plugins.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12533">12533</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12533","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-04-12 05:24:19 +0000 (Wed, 12 Apr 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Store required plugins as an array, and an additional flag for when dependencies are not met by published WordPress.org-hosted plugins.
See <a href="http://meta.trac.wordpress.org/ticket/6921">#6921</a>, <a href="http://meta.trac.wordpress.org/changeset/12532">[12532]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php 2023-04-12 04:50:46 UTC (rev 12532)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php 2023-04-12 05:24:19 UTC (rev 12533)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,10 +112,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['requires'] = get_post_meta( $post_id, 'requires', true ) ?: false;
- $result['tested'] = get_post_meta( $post_id, 'tested', true ) ?: false;
- $result['requires_php'] = get_post_meta( $post_id, 'requires_php', true ) ?: false;
- $result['compatibility'] = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['requires'] = get_post_meta( $post_id, 'requires', true ) ?: false;
+ $result['tested'] = get_post_meta( $post_id, 'tested', true ) ?: false;
+ $result['requires_php'] = get_post_meta( $post_id, 'requires_php', true ) ?: false;
+ $result['requires_plugins'] = get_post_meta( $post_id, 'requires_plugins', true ) ?: [];
+ $result['compatibility'] = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( '\WPORG_Ratings' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result['rating'] = \WPORG_Ratings::get_avg_rating( 'plugin', $post->post_name ) ?: 0;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2023-04-12 04:50:46 UTC (rev 12532)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2023-04-12 05:24:19 UTC (rev 12533)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,18 +41,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Plugin headers that are stored in plugin meta
</span><span class="cx" style="display: block; padding: 0 10px"> public $plugin_headers = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Header => meta_key
- 'Name' => 'header_name',
- 'PluginURI' => 'header_plugin_uri',
- 'Author' => 'header_author',
- 'AuthorURI' => 'header_author_uri',
- 'TextDomain' => 'header_textdomain',
- 'RequiresPlugins' => 'requires_plugins'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Header => meta_key
+ 'Name' => 'header_name',
+ 'PluginURI' => 'header_plugin_uri',
+ 'Author' => 'header_author',
+ 'AuthorURI' => 'header_author_uri',
+ 'TextDomain' => 'header_textdomain',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // These headers are stored in these fields, but are handled separately.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 'Version' => 'version',
- // 'RequiresWP' => 'requires',
- // 'RequiresPHP' => 'requires_php',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 'Version' => 'version',
+ // 'RequiresWP' => 'requires',
+ // 'RequiresPHP' => 'requires_php',
+ // 'RequiresPlugins' => 'requires_plugins'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,6 +241,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, 'plugin_name_history', wp_slash( $plugin_names ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Validate whether the dependencies are met by WordPress.org-hosted plugins.
+ $requires_plugins = array_map( 'trim', explode( ',', $headers->RequiresPlugins ) );
+ $requires_plugins_unmet = false;
+ foreach ( $requires_plugins as $requires_plugin_slug ) {
+ // TODO: Add support for premium plugins.
+ $requires_plugin_post = Plugin_Directory::get_plugin_post( $requires_plugin_slug );
+ if (
+ ! $requires_plugin_post ||
+ 'publish' !== $requires_plugin_post->post_status
+ ) {
+ $requires_plugins_unmet = true;
+ break;
+ }
+ }
+
+ update_post_meta( $plugin->ID, 'requires_plugins', wp_slash( $requires_plugins ) );
+ if ( $requires_plugins_unmet ) {
+ update_post_meta( $plugin->ID, '_requires_plugins_unmet', true );
+ } else {
+ delete_post_meta( $plugin->ID, '_requires_plugins_unmet' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, 'requires', wp_slash( $requires ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, 'requires_php', wp_slash( $requires_php ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, 'tagged_versions', wp_slash( array_keys( $tagged_versions ) ) );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2023-04-12 04:50:46 UTC (rev 12532)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2023-04-12 05:24:19 UTC (rev 12533)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +377,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'header_author_uri' => $this->plugin['AuthorURI'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'header_textdomain' => $this->plugin['TextDomain'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'header_description' => $this->plugin['Description'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'requires_plugins' => $this->plugin['RequiresPlugins'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'requires_plugins' => array_map( 'trim', explode( ',', $this->plugin['RequiresPlugins'] ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'assets_screenshots' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'assets_icons' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'assets_banners' => array(),
</span></span></pre>
</div>
</div>
</body>
</html>