Ticket #31470: 31470.diff

src/wp-admin/includes/update.php

@@ -191 +191 @@
 add_filter( 'update_footer', 'core_update_footer' );
 
 function update_nag() {
-        if ( is_multisite() && !current_user_can('update_core') )
+        if ( is_multisite() && ! current_user_can( 'update_core' ) ) {
                 return false;
+        }
 
         global $pagenow;
 
-        if ( 'update-core.php' == $pagenow )
+        if ( 'update-core.php' == $pagenow ) {
                 return;
+        }
 
         $cur = get_preferred_from_update_core();
 
-        if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
+        if ( ! isset( $cur->response ) || 'upgrade' != $cur->response ) {
                 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' ) );
+        } elseif ( current_user_can( 'publish_pages' ) ) {
+                $msg = sprintf( __( '<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.' ), $cur->current );
         }
         echo "<div class='update-nag'>$msg</div>";
 }
@@ -415 +418 @@
                  * This flag is cleared whenever a successful update occurs using Core_Upgrader.
                  */
                 $comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-                if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
+                if ( version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
                         $nag = true;
+                }
         }
 
-        if ( ! $nag )
+        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' );
+        } elseif ( current_user_can( 'publish_pages' ) ) {
+                $msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
+        }
 
         echo "<div class='update-nag'>$msg</div>";
 }