Ticket #57999: 57999.diff

wp-admin/update-core.php

@@ -1031 +1031 @@
 
         <?php
         if ( $upgrade_error ) {
-                echo '<div class="error"><p>';
+                $themes  = get_theme_updates();
+
                 if ( 'themes' === $upgrade_error ) {
+                        if (!empty ( $themes ) ) {
+                        echo '<div class="error"><p>';
                         _e( 'Please select one or more themes to update.' );
-                } else {
-                        _e( 'Please select one or more plugins to update.' );
+                        }
                 }
+                
+                else {
+                        $plugins = get_plugin_updates();
+                        if ( !empty ( $plugins ) ){
+                                echo '<div class="error"><p>';
+                                _e( 'Please select one or more plugins to update.' );
+                        }
+                }
                 echo '</p></div>';
         }