Ticket #29022: 29022.7.diff

src/wp-admin/includes/class-wp-upgrader-skins.php

@@ -111 +111 @@
                         return;
                 }
 
+                $updated = wp_cache_get( "{$type}_updated", 'updates' );
+                wp_cache_set( "{$type}_updated", intval( $updated ) + 1, 'updates' );
+
+                $update_data = wp_get_update_data();
+
                 if ( defined( 'IFRAME_REQUEST' ) ) {
                         echo '<script type="text/javascript">
                                         if ( window.postMessage && JSON ) {
-                                                window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
+                                                window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '", upgradeTitle: "' . $update_data['title'] . '" } ), window.location.protocol + "//" + window.location.hostname );
                                         }
                                 </script>';
                 } else {
                         echo '<script type="text/javascript">
                                         (function( wp ) {
                                                 if ( wp && wp.updates.decrementCount ) {
-                                                        wp.updates.decrementCount( "' . $type . '" );
+                                                        wp.updates.decrementCount( "' . $type . '", "' . $update_data['title'] . '" );
                                                 }
                                         })( window.wp );
                                 </script>';

src/wp-admin/js/updates.js

@@ -8 +8 @@
          * Decrement update counts throughout the various menus
          *
          * @param {string} updateType
+         * @param {string} title
          */
-        wp.updates.decrementCount = function( upgradeType ) {
+        wp.updates.decrementCount = function( upgradeType, title ) {
                 var count, pluginCount, $elem;
 
                 $elem = $( '#wp-admin-bar-updates .ab-label' );
@@ -18 +19 @@
                 if ( count < 0 ) {
                         return;
                 }
-                $( '#wp-admin-bar-updates .ab-item' ).removeAttr( 'title' );
                 $elem.text( count );
 
+                $( '#wp-admin-bar-updates .ab-item' ).attr( 'title', title );
+                $( '#wp-admin-bar-updates .screen-reader-text' ).text( title );
+
                 $elem = $( 'a[href="update-core.php"] .update-plugins' );
                 $elem.each( function( index, elem ) {
                         elem.className = elem.className.replace( /count-\d+/, 'count-' + count );
@@ -58 +61 @@
                         return;
                 }
 
-                wp.updates.decrementCount( message.upgradeType );
+                wp.updates.decrementCount( message.upgradeType, message.upgradeTitle );
 
         } );
 

src/wp-includes/load.php

@@ -452 +452 @@
 
         if ( function_exists( 'wp_cache_add_global_groups' ) ) {
                 wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
-                wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+                wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins', 'updates' ) );
         }
 }
 

src/wp-includes/update.php

@@ -522 +522 @@
 
         if ( $plugins = current_user_can( 'update_plugins' ) ) {
                 $update_plugins = get_site_transient( 'update_plugins' );
-                if ( ! empty( $update_plugins->response ) )
+                if ( ! empty( $update_plugins->response ) ) {
                         $counts['plugins'] = count( $update_plugins->response );
+                        $plugins_updated = wp_cache_get( 'plugin_updated', 'updates' );
+                        if ( $plugins_updated > 0 ) {
+                                $counts['plugins'] -= $plugins_updated;
+                        }
+                }
         }
 
         if ( $themes = current_user_can( 'update_themes' ) ) {
                 $update_themes = get_site_transient( 'update_themes' );
-                if ( ! empty( $update_themes->response ) )
+                if ( ! empty( $update_themes->response ) ) {
                         $counts['themes'] = count( $update_themes->response );
+                        $themes_updated = wp_cache_get( 'theme_updated', 'updates' );
+                        if ( $themes_updated > 0 ) {
+                                $counts['plugins'] -= $themes_updated;
+                        }
+                }
         }
 
         if ( ( $core = current_user_can( 'update_core' ) ) && function_exists( 'get_core_updates' ) ) {
                 $update_wordpress = get_core_updates( array('dismissed' => false) );
-                if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') )
+                if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') && ! wp_cache_get( 'wordpress_updated', 'updates' ) )
                         $counts['wordpress'] = 1;
         }
 
-        if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() )
-                $counts['translations'] = 1;
+        if ( ( $core || $plugins || $themes ) && $translations = wp_get_translation_updates() ) {
+                $counts['translations'] = count( $translations );
+                $translations_updated = wp_cache_get( 'translation_updated', 'updates' );
+                if ( $translations_updated > 0 ) {
+                        $counts['translations'] -= $translations_updated;
+                }
+        }
 
         $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations'];
         $titles = array();
-        if ( $counts['wordpress'] )
+        if ( $counts['wordpress'] > 0 )
                 $titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );
-        if ( $counts['plugins'] )
+        if ( $counts['plugins'] > 0 )
                 $titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );
-        if ( $counts['themes'] )
+        if ( $counts['themes'] > 0 )
                 $titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
-        if ( $counts['translations'] )
+        if ( $counts['translations'] > 0 )
                 $titles['translations'] = __( 'Translation Updates' );
 
         $update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';