Changeset 27929

Timestamp:

04/03/2014 05:40:00 AM (11 years ago)

Author:

dd32

Message:

Background Updates: Fix a PHP Warning caused by a Upgrader instance being passed into the Theme & Plugin $extra_stats parameter.
Background Updates: Fix two variable typos in r27905

Merges [27906], [27928] to the 3.8 branch.
Fixes #27633.

Location:

branches/3.8

Files:

• . (modified) (1 prop)
• src/wp-includes/update.php (modified) (4 diffs)

branches/3.8/src/wp-includes/update.php

@@ -260 +260 @@
     );
 
-    if ( $plugin_update_stats ) {
+    if ( $extra_stats ) {
         $options['body']['update_stats'] = json_encode( $extra_stats );
     }
@@ -405 +405 @@
     );
 
-    if ( $theme_update_stats ) {
+    if ( $extra_stats ) {
         $options['body']['update_stats'] = json_encode( $extra_stats );
     }
@@ -621 +621 @@
 add_action( 'admin_init', '_maybe_update_plugins' );
 add_action( 'wp_update_plugins', 'wp_update_plugins' );
-add_action( 'upgrader_process_complete', 'wp_update_plugins' );
+add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
 
 add_action( 'load-themes.php', 'wp_update_themes' );
@@ -628 +628 @@
 add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );
-add_action( 'upgrader_process_complete', 'wp_update_themes' );
+add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
 
 add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );