Changeset 18843

Timestamp:

09/30/2011 05:31:52 PM (14 years ago)

Author:

markjaquith

Message:

More consistent right-now/footer messages related to version and upgrades in multisite. propx SergeyBiryukov. fixes #15545

File:

• trunk/wp-admin/includes/update.php (modified) (2 diffs)

trunk/wp-admin/includes/update.php

@@ -83 +83 @@
 
 function core_update_footer( $msg = '' ) {
-    if ( is_multisite() && !current_user_can('update_core') )
-        return false;
-
     if ( !current_user_can('update_core') )
         return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
@@ -141 +138 @@
 // Called directly from dashboard
 function update_right_now_message() {
-    if ( is_multisite() && !current_user_can('update_core') )
-        return false;
-
-    $cur = get_preferred_from_update_core();
-
     $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
 
-    if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
-        $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
+    if ( current_user_can('update_core') ) {
+        $cur = get_preferred_from_update_core();
+
+        if ( isset( $cur->response ) && $cur->response == 'upgrade'  )
+            $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
     }