<!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>[7072] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Use geopattern icon assets in the `plugins/update-check` API response.</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/7072">7072</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/7072","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>2018-04-10 02:42:42 +0000 (Tue, 10 Apr 2018)</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: Use geopattern icon assets in the `plugins/update-check` API response.
This change populates the `update_source` table which the update-check API uses, another change is needed to the update check itself to pull them through.
Additionally a bin script to trigger an update for a single row (or all) is included.
See <a href="http://meta.trac.wordpress.org/ticket/3265">#3265</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassapiupdateupdaterphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorybinrebuildupdate_sourcetablephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-update_source-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorybinrebuildupdate_sourcetablephpfromrev7071sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorybinresyncratingsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-update_source-table.php (from rev 7071, sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/resync-ratings.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/bin/rebuild-update_source-table.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-update_source-table.php 2018-04-10 02:42:42 UTC (rev 7072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,66 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Plugin_Directory;
+
+use WordPressdotorg\Plugin_Directory\Plugin_Directory;
+
+// This script should only be called in a CLI environment.
+if ( 'cli' != php_sapi_name() ) {
+ die();
+}
+$opts = getopt( '', array( 'plugin:', 'url:', 'abspath:' ) );
+
+if ( empty( $opts['url'] ) ) {
+ $opts['url'] = 'https://wordpress.org/plugins/';
+}
+if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) {
+ $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) );
+}
+
+// Bootstrap WordPress
+$_SERVER['HTTP_HOST'] = parse_url( $opts['url'], PHP_URL_HOST );
+$_SERVER['REQUEST_URI'] = parse_url( $opts['url'], PHP_URL_PATH );
+
+require rtrim( $opts['abspath'], '/' ) . '/wp-load.php';
+
+if ( ! class_exists( '\WordPressdotorg\Plugin_Directory\Plugin_Directory' ) ) {
+ fwrite( STDERR, "Error! This site doesn't have the Plugin Directory plugin enabled.\n" );
+ if ( defined( 'WPORG_PLUGIN_DIRECTORY_BLOGID' ) ) {
+ fwrite( STDERR, "Run the following command instead:\n" );
+ fwrite( STDERR, "\tphp " . implode( ' ', $argv ) . ' --url ' . get_site_url( WPORG_PLUGIN_DIRECTORY_BLOGID, '/' ) . "\n" );
+ }
+ die();
+}
+
+if ( !empty( $opts['plugin'] ) ) {
+ $sql = $wpdb->prepare( "SELECT post_name FROM {$wpdb->posts} WHERE post_type = 'plugin' and post_status = 'publish' AND post_name = %s", $opts['plugin'] );
+} else {
+ // All plugins.
+ $sql = "SELECT post_name FROM {$wpdb->posts} WHERE post_type = 'plugin' and post_status = 'publish'";
+}
+
+$slugs = $wpdb->get_col( $sql );
+if ( ! $slugs ) {
+ fwrite( STDERR, "Error! The plugin(s) could not be located.\n" );
+ die();
+}
+
+foreach ( $slugs as $i => $slug ) {
+ echo ++$i . '/' . count( $slugs ) . "\t" . $slug . "\n";
+
+ Jobs\API_Update_Updater::update_single_plugin( $slug );
+
+ clear_memory_caches();
+}
+
+function clear_memory_caches() {
+ global $wpdb, $wp_object_cache;
+
+ $wpdb->queries = [];
+
+ if ( is_object( $wp_object_cache ) ) {
+ $wp_object_cache->cache = [];
+ $wp_object_cache->group_ops = [];
+ $wp_object_cache->memcache_debug = [];
+ $wp_object_cache->stats = [ 'get' => 0, 'delete' => 0, 'add' => 0 ];
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp"></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/class-template.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/class-template.php 2018-04-10 00:50:17 UTC (rev 7071)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php 2018-04-10 02:42:42 UTC (rev 7072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +389,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $icon || 'publish' !== $plugin->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $generated = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $icon = self::get_geopattern_icon_url( $plugin );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $icon = $svg = self::get_geopattern_icon_url( $plugin );
</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"> switch ( $output ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @static
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|\WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. Output type. 'html' or 'raw'. Default: 'raw'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. Output type. 'html', 'raw', or 'raw_with_rtl'. Default: 'raw'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_plugin_banner( $post = null, $output = 'raw' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,15 +472,17 @@
</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">- if ( is_rtl() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_rtl() || 'raw_with_rtl' == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $rtl_banners as $info ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $info['resolution'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case '1544x500':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $banner_2x = self::get_asset_url( $plugin, $info );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = 'raw_with_rtl' == $output ? 'banner_2x_rtl' : 'banner_2x';
+ $$field = self::get_asset_url( $plugin, $info );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case '772x250':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $banner = self::get_asset_url( $plugin, $info );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = 'raw_with_rtl' == $output ? 'banner_rtl' : 'banner';
+ $$field = self::get_asset_url( $plugin, $info );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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">@@ -505,8 +507,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'raw':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'raw_with_rtl':
</ins><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return compact( 'banner', 'banner_2x' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return compact( 'banner', 'banner_2x', 'banner_rtl', 'banner_2x_rtl' );
</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></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassapiupdateupdaterphp"></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/jobs/class-api-update-updater.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/jobs/class-api-update-updater.php 2018-04-10 00:50:17 UTC (rev 7071)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php 2018-04-10 02:42:42 UTC (rev 7072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Plugin_Directory\Jobs;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Plugin_Directory;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Template;
</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"> * Handles interfacing with the api.WordPress.org/plugin/update-check/ API.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- $data = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_id' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_slug' => $post->post_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'available' => 'publish' === $post->post_status || 'disabled' === $post->post_status,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,6 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'requires' => get_post_meta( $post->ID, 'requires', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'requires_php' => get_post_meta( $post->ID, 'requires_php', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'upgrade_notice' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'assets' => serialize( self::get_plugin_assets( $post ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'last_updated' => $post->post_modified,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_notice = get_post_meta( $post->ID, 'upgrade_notice', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,6 +113,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">+ static function get_plugin_assets( $post ) {
+ $icons = $banners = $banners_rtl = array();
+
+ $raw_icons = Template::get_plugin_icon( $post, 'raw' );
+ $raw_banners = Template::get_plugin_banner( $post, 'raw_with_rtl' );
+
+ // Banners
+ if ( !empty( $raw_banners['banner_2x'] ) ) {
+ $banners['2x'] = $raw_banners['banner_2x'];
+ }
+ if ( !empty( $raw_banners['banner'] ) ) {
+ $banners['1x'] = $raw_banners['banner'];
+ }
+ if ( $banners ) {
+ $banners['default'] = $banners['2x'] ?? $banners['1x'];
+ }
+
+ // RTL Banners (get_plugin_banner 'raw_with_rtl' returns these)
+ if ( !empty( $raw_banners['banner_2x_rtl'] ) ) {
+ $banners_rtl['2x'] = $raw_banners['banner_2x_rtl'];
+ }
+ if ( !empty( $raw_banners['banner_rtl'] ) ) {
+ $banners_rtl['1x'] = $raw_banners['banner_rtl'];
+ }
+ if ( $banners_rtl ) {
+ $banners_rtl['default'] = $banners_rtl['2x'] ?? $banners_rtl['1x'];
+ }
+
+ // Icons.
+ if ( !empty( $raw_icons['icon_2x'] ) ) {
+ $icons['2x'] = $raw_icons['icon_2x'];
+ }
+ if ( !empty( $raw_icons['icon'] ) ) {
+ $icons['1x'] = $raw_icons['icon'];
+ }
+ if ( !empty( $raw_icons['svg'] ) ) {
+ $icons['svg'] = $raw_icons['svg'];
+
+ // We don't need to set the 1x field when it's the SVG.
+ if ( isset( $icons['1x'] ) && $icons['1x'] == $icons['svg'] ) {
+ unset( $icons['1x'] );
+ }
+ }
+ if ( $icons ) {
+ $icons['default'] = $icons['svg'] ?? ( $icons['2x'] ?? $icons['1x'] );
+ }
+
+ return (object) compact( 'icons', 'banners', 'banners_rtl' );
+ }
+
</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">@@ -127,6 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> `requires` varchar(128) NOT NULL DEFAULT '',
</span><span class="cx" style="display: block; padding: 0 10px"> `requires_php` varchar(128) NOT NULL DEFAULT '',
</span><span class="cx" style="display: block; padding: 0 10px"> `upgrade_notice` text,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ `assets` text NOT NULL DEFAULT '',
</ins><span class="cx" style="display: block; padding: 0 10px"> `last_updated` datetime NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (`plugin_id`),
</span><span class="cx" style="display: block; padding: 0 10px"> UNIQUE KEY `plugin_slug` (`plugin_slug`),
</span></span></pre>
</div>
</div>
</body>
</html>