Ticket #15525: 15525.2.patch

wp-includes/admin-bar.php

@@ -275 +275 @@
 
         $update_title = sprintf( __('Updates %s'), "<span id='ab-updates' class='count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" );
 
-        $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => admin_url('update-core.php') ) );
+        $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+
+        $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => $href ) );
 }
 
 /**

wp-admin/includes/update.php

@@ -98 +98 @@
         if ( ! isset( $cur->response ) )
                 $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;
 
         case 'latest' :
@@ -129 +131 @@
         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, '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>";
@@ -146 +150 @@
         $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='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>";
 }
 

wp-admin/theme-editor.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
+if ( is_multisite() && ! is_network_admin() )
+        wp_redirect( network_admin_url( 'theme-editor.php') );
+
 if ( !current_user_can('edit_themes') )
         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
 

wp-admin/plugin-install.php

@@ -12 +12 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
+if ( is_multisite() && ! is_network_admin() )
+        wp_redirect( network_admin_url( 'plugin-install.php') );
+
 $wp_list_table = get_list_table('WP_Plugin_Install_List_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();

wp-admin/theme-install.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
+if ( is_multisite() && ! is_network_admin() )
+        wp_redirect( network_admin_url( 'theme-install.php') );
+
 $wp_list_table = get_list_table('WP_Theme_Install_List_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();

wp-admin/update-core.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
+if ( is_multisite() && ! is_network_admin() )
+        wp_redirect( network_admin_url( 'update-core.php') );
+
 if ( ! current_user_can('update_plugins') )
         wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
 
@@ -327 +330 @@
         }
 ?>
         <div class="wrap">
-        <?php screen_icon(); ?>
+        <?php screen_icon( 'tools' ); ?>
         <h2><?php _e('Update WordPress'); ?></h2>
 <?php
         if ( $wp_filesystem->errors->get_error_code() ) {

wp-admin/plugin-editor.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
+if ( is_multisite() && ! is_network_admin() )
+        wp_redirect( network_admin_url( 'plugin-editor.php') );
+
 if ( !current_user_can('edit_plugins') )
         wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );