Changeset 16747 for trunk/wp-admin/includes/update.php

Timestamp:

12/06/2010 03:41:19 PM (16 years ago)

Author:

nacin

Message:

Link to network/update-core when running multisite. Remove theme/plugin editors from blog menu when running multisite. Redirect to network/* when accessing theme/plugin-install/editor. props ocean90, see #15525.

File:

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

trunk/wp-admin/includes/update.php

@@ -99 +99 @@
                 $cur->response = '';
 
+        $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+
         switch ( $cur->response ) {
         case 'development' :
-                return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update-core.php');
+                return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], $href );
         break;
 
         case 'upgrade' :
-                return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current);
+                return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', $href, $cur->current);
         break;
 
@@ -130 +132 @@
                 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, 'update-core.php' );
-        else
+        if ( current_user_can('update_core') ) {
+                $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+                $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, $href );
+        } 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 );
-
+        }
         echo "<div class='update-nag'>$msg</div>";
 }
@@ -147 +150 @@
 
         $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='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
+
+        if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
+                $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+                $msg .= " <a href='" . $href . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
+        }
 
         echo "<span id='wp-version-message'>$msg</span>";