Ticket #13071: 13071.2.patch

src/wp-admin/includes/admin-filters.php

@@ -96 +96 @@
 add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
 
 // Update hooks.
-add_action( 'admin_init', 'wp_plugin_update_rows' );
-add_action( 'admin_init', 'wp_theme_update_rows'  );
+add_action( 'after_plugin_row', 'wp_plugin_update_rows', 10, 0 ); // Needs to run after wp_update_plugins().
+add_action( 'after_theme_row', 'wp_theme_update_rows', 10, 0 ); // Needs to run after wp_update_themes().
 
 add_action( 'admin_notices', 'update_nag',      3  );
 add_action( 'admin_notices', 'maintenance_nag', 10 );

src/wp-admin/includes/update.php

@@ -296 +296 @@
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-        if ( !current_user_can('update_plugins' ) )
+        remove_action( 'after_plugin_row', 'wp_plugin_update_rows' );
+
+        if ( ! current_user_can( 'update_plugins' ) ) {
                 return;
+        }
 
         $plugins = get_site_transient( 'update_plugins' );
         if ( isset($plugins->response) && is_array($plugins->response) ) {
@@ -432 +435 @@
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-        if ( !current_user_can('update_themes' ) )
+        remove_action( 'after_theme_row', 'wp_theme_update_rows' );
+
+        if ( ! current_user_can( 'update_themes' ) ) {
                 return;
+        }
 
         $themes = get_site_transient( 'update_themes' );
         if ( isset($themes->response) && is_array($themes->response) ) {