Ticket #31470: 31470.2.patch

src/wp-admin/includes/update.php

@@ -204 +204 @@
         if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
                 return false;
 
-        if ( current_user_can('update_core') ) {
-                $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, network_admin_url( 'update-core.php' ) );
-        } else {
-                $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
+        if ( current_user_can( 'update_core' ) ) {
+                $msg = sprintf( __( '<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.' ), $cur->current, network_admin_url( 'update-core.php' ) );
+                echo "<div class='update-nag'>$msg</div>";
         }
-        echo "<div class='update-nag'>$msg</div>";
 }
 add_action( 'admin_notices', 'update_nag', 3 );
 add_action( 'network_admin_notices', 'update_nag', 3 );
@@ -422 +420 @@
         if ( ! $nag )
                 return false;
 
-        if ( current_user_can('update_core') )
-                $msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
-        else
-                $msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
+        if ( current_user_can( 'update_core' ) ) {
+                $msg = sprintf( __( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ), 'update-core.php' );
+                echo "<div class='update-nag'>$msg</div>";
+        }
 
         echo "<div class='update-nag'>$msg</div>";
 }