Changeset 12830

Timestamp:

01/25/2010 11:07:49 PM (16 years ago)

Author:

wpmuguru

Message:

Move network screen to the tools menu, See #12027

Location:

trunk/wp-admin

Files:

• menu.php (modified) (2 diffs)
• network.php (moved) (moved from trunk/wp-admin/options-network.php) (2 diffs)

trunk/wp-admin/menu.php

@@ -139 +139 @@
     if ( is_multisite() && ($current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path) )
         $submenu['tools.php'][25] = array( __('Delete Blog'), 'manage_options', 'ms-delete-site.php' );
+    if ( !is_multisite() && is_super_admin() )
+        $submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
@@ -150 +152 @@
     if ( is_super_admin() )
         $submenu['options-general.php'][45] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
-    if ( !is_multisite() && is_super_admin() )
-        $submenu['options-general.php'][50] = array(__('Network'), 'manage_options', 'options-network.php');
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group

trunk/wp-admin/network.php

@@ -16 +16 @@
 
 $title = __('Network Settings');
-$parent_file = 'options-network.php';
+$parent_file = 'tools.php';
 
 add_contextual_help($current_screen, __('<a href="http://codex.wordpress.org/Settings_Network_SubPanel" target="_blank">Network Settings</a>'));
@@ -32 +32 @@
 <h2><?php echo esc_html( $title ); ?></h2>
 
-<form method="post" action="options-network.php">
+<form method="post" action="network.php">
 <?php
 function filestats( $err ) {