Index: /trunk/wp-admin/includes/update.php
===================================================================
--- /trunk/wp-admin/includes/update.php (revision 16746)
+++ /trunk/wp-admin/includes/update.php (revision 16747)
@@ -99,11 +99,13 @@
$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 stay updated.' ), $GLOBALS['wp_version'], 'update-core.php');
+ return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], $href );
break;
case 'upgrade' :
- return sprintf( ''.__( 'Get Version %2$s' ).'', 'update-core.php', $cur->current);
+ return sprintf( ''.__( 'Get Version %2$s' ).'', $href, $cur->current);
break;
@@ -130,9 +132,10 @@
return false;
- if ( current_user_can('update_core') )
- $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $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( __('WordPress %1$s is available! Please update now.'), $cur->current, $href );
+ } else {
$msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current );
-
+ }
echo "
$msg
";
}
@@ -147,6 +150,9 @@
$msg = sprintf( __('You are using WordPress %s.'), $GLOBALS['wp_version'] );
- if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') )
- $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '';
+
+ 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 .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '';
+ }
echo "$msg";
Index: /trunk/wp-admin/menu.php
===================================================================
--- /trunk/wp-admin/menu.php (revision 16746)
+++ /trunk/wp-admin/menu.php (revision 16747)
@@ -152,5 +152,6 @@
// Add 'Editor' to the bottom of the Appearence menu.
-add_action('admin_menu', '_add_themes_utility_last', 101);
+if ( ! is_multisite() )
+ add_action('admin_menu', '_add_themes_utility_last', 101);
function _add_themes_utility_last() {
// Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook
@@ -172,5 +173,6 @@
/* translators: add new plugin */
$submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
- $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
+ if ( ! is_multisite() )
+ $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
}
unset($menu_perms, $update_plugins, $update_count);
Index: /trunk/wp-admin/plugin-editor.php
===================================================================
--- /trunk/wp-admin/plugin-editor.php (revision 16746)
+++ /trunk/wp-admin/plugin-editor.php (revision 16747)
@@ -9,4 +9,9 @@
/** WordPress Administration Bootstrap */
require_once('./admin.php');
+
+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'plugin-editor.php' ) );
+ exit();
+}
if ( !current_user_can('edit_plugins') )
Index: /trunk/wp-admin/plugin-install.php
===================================================================
--- /trunk/wp-admin/plugin-install.php (revision 16746)
+++ /trunk/wp-admin/plugin-install.php (revision 16747)
@@ -12,4 +12,9 @@
/** WordPress Administration Bootstrap */
require_once('./admin.php');
+
+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'plugin-install.php' ) );
+ exit();
+}
$wp_list_table = get_list_table('WP_Plugin_Install_List_Table');
Index: /trunk/wp-admin/theme-editor.php
===================================================================
--- /trunk/wp-admin/theme-editor.php (revision 16746)
+++ /trunk/wp-admin/theme-editor.php (revision 16747)
@@ -9,4 +9,9 @@
/** WordPress Administration Bootstrap */
require_once('./admin.php');
+
+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'theme-editor.php' ) );
+ exit();
+}
if ( !current_user_can('edit_themes') )
Index: /trunk/wp-admin/theme-install.php
===================================================================
--- /trunk/wp-admin/theme-install.php (revision 16746)
+++ /trunk/wp-admin/theme-install.php (revision 16747)
@@ -12,4 +12,9 @@
/** WordPress Administration Bootstrap */
require_once('./admin.php');
+
+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'theme-install.php' ) );
+ exit();
+}
$wp_list_table = get_list_table('WP_Theme_Install_List_Table');
Index: /trunk/wp-admin/themes.php
===================================================================
--- /trunk/wp-admin/themes.php (revision 16746)
+++ /trunk/wp-admin/themes.php (revision 16747)
@@ -74,5 +74,13 @@
-
+
+
+
+
+
+
Index: /trunk/wp-admin/update-core.php
===================================================================
--- /trunk/wp-admin/update-core.php (revision 16746)
+++ /trunk/wp-admin/update-core.php (revision 16747)
@@ -9,4 +9,9 @@
/** WordPress Administration Bootstrap */
require_once('./admin.php');
+
+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'update-core.php' ) );
+ exit();
+}
if ( ! current_user_can('update_plugins') )
Index: /trunk/wp-includes/admin-bar.php
===================================================================
--- /trunk/wp-includes/admin-bar.php (revision 16746)
+++ /trunk/wp-includes/admin-bar.php (revision 16747)
@@ -279,5 +279,7 @@
$update_title = sprintf( __('Updates %s'), "
" . number_format_i18n($update_count) . "" );
- $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 ) );
}