<!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>[27905] trunk/src: Background Updates: Record Plugin & Theme update statistics like we for for Core updates, Pass Plugin/Theme update objects into the Background updater for consistency with Core & Translations.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27905">27905</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2014-04-02 13:04:30 +0000 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Background Updates: Record Plugin & Theme update statistics like we for for Core updates, Pass Plugin/Theme update objects into the Background updater for consistency with Core & Translations. See <a href="http://core.trac.wordpress.org/ticket/27633">#27633</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (27904 => 27905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2014-04-02 06:11:49 UTC (rev 27904)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2014-04-02 13:04:30 UTC (rev 27905)
</span><span class="lines">@@ -1974,18 +1974,21 @@
</span><span class="cx"> if ( ! $this->should_update( $type, $item, $context ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ $upgrader_item = $item;
</ins><span class="cx"> switch ( $type ) {
</span><span class="cx"> case 'core':
</span><span class="cx"> $skin->feedback( __( 'Updating to WordPress %s' ), $item->version );
</span><span class="cx"> $item_name = sprintf( __( 'WordPress %s' ), $item->version );
</span><span class="cx"> break;
</span><span class="cx"> case 'theme':
</span><del>- $theme = wp_get_theme( $item );
</del><ins>+ $upgrader_item = $item->theme;
+ $theme = wp_get_theme( $upgrader_item );
</ins><span class="cx"> $item_name = $theme->Get( 'Name' );
</span><span class="cx"> $skin->feedback( __( 'Updating theme: %s' ), $item_name );
</span><span class="cx"> break;
</span><span class="cx"> case 'plugin':
</span><del>- $plugin_data = get_plugin_data( $context . '/' . $item );
</del><ins>+ $upgrader_item = $item->plugin;
+ $plugin_data = get_plugin_data( $context . '/' . $upgrader_item );
</ins><span class="cx"> $item_name = $plugin_data['Name'];
</span><span class="cx"> $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
</span><span class="cx"> break;
</span><span class="lines">@@ -1997,7 +2000,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Boom, This sites about to get a whole new splash of paint!
</span><del>- $upgrade_result = $upgrader->upgrade( $item, array(
</del><ins>+ $upgrade_result = $upgrader->upgrade( $upgrader_item, array(
</ins><span class="cx"> 'clear_update_cache' => false,
</span><span class="cx"> 'pre_check_md5' => false, /* always use partial builds if possible for core updates */
</span><span class="cx"> 'attempt_rollback' => true, /* only available for core updates */
</span><span class="lines">@@ -2071,7 +2074,7 @@
</span><span class="cx"> wp_update_plugins(); // Check for Plugin updates
</span><span class="cx"> $plugin_updates = get_site_transient( 'update_plugins' );
</span><span class="cx"> if ( $plugin_updates && !empty( $plugin_updates->response ) ) {
</span><del>- foreach ( array_keys( $plugin_updates->response ) as $plugin ) {
</del><ins>+ foreach ( $plugin_updates->response as $plugin ) {
</ins><span class="cx"> $this->update( 'plugin', $plugin );
</span><span class="cx"> }
</span><span class="cx"> // Force refresh of plugin update information
</span><span class="lines">@@ -2082,8 +2085,8 @@
</span><span class="cx"> wp_update_themes(); // Check for Theme updates
</span><span class="cx"> $theme_updates = get_site_transient( 'update_themes' );
</span><span class="cx"> if ( $theme_updates && !empty( $theme_updates->response ) ) {
</span><del>- foreach ( array_keys( $theme_updates->response ) as $theme ) {
- $this->update( 'theme', $theme );
</del><ins>+ foreach ( $theme_updates->response as $theme ) {
+ $this->update( 'theme', (object) $theme );
</ins><span class="cx"> }
</span><span class="cx"> // Force refresh of theme update information
</span><span class="cx"> wp_clean_themes_cache();
</span><span class="lines">@@ -2098,9 +2101,22 @@
</span><span class="cx">
</span><span class="cx"> // Clean up, and check for any pending translations
</span><span class="cx"> // (Core_Upgrader checks for core updates)
</span><del>- wp_update_themes(); // Check for Theme updates
- wp_update_plugins(); // Check for Plugin updates
</del><ins>+ $theme_stats = array();
+ if ( isset( $this->update_results['theme'] ) ) {
+ foreach ( $this->update_results['theme'] as $upgrade ) {
+ $theme_stats[ $upgrade->item->theme ] = ( true === $upgrade->result );
+ }
+ }
+ wp_update_themes( $theme_stats ); // Check for Theme updates
</ins><span class="cx">
</span><ins>+ $plugin_stats = array();
+ if ( isset( $this->update_results['plugin'] ) ) {
+ foreach ( $this->update_results['plugin'] as $upgrade ) {
+ $plugin_stats[ $upgrade->item->plugin ] = ( true === $upgrade->result );
+ }
+ }
+ wp_update_plugins( $plugin_stats ); // Check for Plugin updates
+
</ins><span class="cx"> // Finally, Process any new translations
</span><span class="cx"> $language_updates = wp_get_translation_updates();
</span><span class="cx"> if ( $language_updates ) {
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/update.php (27904 => 27905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/update.php 2014-04-02 06:11:49 UTC (rev 27904)
+++ trunk/src/wp-includes/update.php 2014-04-02 13:04:30 UTC (rev 27905)
</span><span class="lines">@@ -166,9 +166,10 @@
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @uses $wp_version Used to notify the WordPress version.
</span><span class="cx"> *
</span><ins>+ * @param array $extra_stats Extra statistics to report to the WordPress.org API.
</ins><span class="cx"> * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
</span><span class="cx"> */
</span><del>-function wp_update_plugins() {
</del><ins>+function wp_update_plugins( $extra_stats = array() ) {
</ins><span class="cx"> include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
</span><span class="cx">
</span><span class="cx"> if ( defined('WP_INSTALLING') )
</span><span class="lines">@@ -207,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
</span><span class="cx">
</span><del>- if ( $time_not_changed ) {
</del><ins>+ if ( $time_not_changed && ! $extra_stats ) {
</ins><span class="cx"> $plugin_changed = false;
</span><span class="cx"> foreach ( $plugins as $file => $p ) {
</span><span class="cx"> $new_option->checked[ $file ] = $p['Version'];
</span><span class="lines">@@ -256,6 +257,10 @@
</span><span class="cx"> 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ if ( $plugin_update_stats ) {
+ $options['body']['update_stats'] = json_encode( $extra_stats );
+ }
+
</ins><span class="cx"> $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
</span><span class="cx"> if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</span><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="lines">@@ -296,9 +301,10 @@
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> * @uses $wp_version Used to notify the WordPress version.
</span><span class="cx"> *
</span><ins>+ * @param array $extra_stats Extra statistics to report to the WordPress.org API.
</ins><span class="cx"> * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
</span><span class="cx"> */
</span><del>-function wp_update_themes() {
</del><ins>+function wp_update_themes( $extra_stats = array() ) {
</ins><span class="cx"> include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
</span><span class="cx">
</span><span class="cx"> if ( defined( 'WP_INSTALLING' ) )
</span><span class="lines">@@ -348,7 +354,7 @@
</span><span class="cx">
</span><span class="cx"> $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
</span><span class="cx">
</span><del>- if ( $time_not_changed ) {
</del><ins>+ if ( $time_not_changed && ! $extra_stats ) {
</ins><span class="cx"> $theme_changed = false;
</span><span class="cx"> foreach ( $checked as $slug => $v ) {
</span><span class="cx"> if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
</span><span class="lines">@@ -395,6 +401,10 @@
</span><span class="cx"> 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ if ( $theme_update_stats ) {
+ $options['body']['update_stats'] = json_encode( $extra_stats );
+ }
+
</ins><span class="cx"> $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
</span><span class="cx"> if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</span><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span></span></pre>
</div>
</div>
</body>
</html>