Changeset 16747

Timestamp:

12/06/2010 03:41:19 PM (14 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.

Location:

trunk

Files:

• wp-admin/includes/update.php (modified) (3 diffs)
• wp-admin/menu.php (modified) (2 diffs)
• wp-admin/plugin-editor.php (modified) (1 diff)
• wp-admin/plugin-install.php (modified) (1 diff)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-admin/theme-install.php (modified) (1 diff)
• wp-admin/themes.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)

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>";

trunk/wp-admin/menu.php

@@ -152 +152 @@
 
 // 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 +173 @@
         /* 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);

trunk/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' ) );
+    exit();
+}
 
 if ( !current_user_can('edit_plugins') )

trunk/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' ) );
+    exit();
+}
 
 $wp_list_table = get_list_table('WP_Plugin_Install_List_Table');

trunk/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' ) );
+    exit();
+}
 
 if ( !current_user_can('edit_themes') )

trunk/wp-admin/theme-install.php

@@ -12 +12 @@
 /** 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');

trunk/wp-admin/themes.php

@@ -74 +74 @@
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php if ( current_user_can('install_themes') ) { ?><a href="theme-install.php" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php } ?></h2>
+<h2 class="nav-tab-wrapper">
+<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a>
+<?php
+if ( current_user_can('install_themes') ) {
+    $href = is_multisite() ? network_admin_url( 'theme-install.php' ) : admin_url( 'theme-install.php' );
+?>
+<a href="<?php echo $href; ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a>
+<?php } ?>
+</h2>
 
 <h3><?php _e('Current Theme'); ?></h3>

trunk/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' ) );
+    exit();
+}
 
 if ( ! current_user_can('update_plugins') )

trunk/wp-includes/admin-bar.php

@@ -279 +279 @@
     $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 ) );
 }