From 6690680e9cd30254c39cd6185c643c369820c6f8 Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 25 Jan 2010 23:07:49 +0000
Subject: [PATCH] Move network screen to the tools menu, See #12027

git-svn-id: http://svn.automattic.com/wordpress/trunk@12830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php                             | 4 ++--
 wp-admin/{options-network.php => network.php} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename wp-admin/{options-network.php => network.php} (99%)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index cb27cc839..e0d8a4416 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -138,6 +138,8 @@ $menu[75] = array( __('Tools'), 'read', 'tools.php', '', 'menu-top', 'menu-tools
 		$submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins',  'update-core.php');
 	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' );
 	$submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
@@ -149,8 +151,6 @@ $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '',
 	$submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
 	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
 
diff --git a/wp-admin/options-network.php b/wp-admin/network.php
similarity index 99%
rename from wp-admin/options-network.php
rename to wp-admin/network.php
index dcb4c0b95..8846b4063 100644
--- a/wp-admin/options-network.php
+++ b/wp-admin/network.php
@@ -15,7 +15,7 @@ if ( ! is_super_admin() )
 	wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
 
 $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>'));
 
@@ -31,7 +31,7 @@ $dirs = array( substr( ABSPATH, 0, -1), ABSPATH . "wp-content" );
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
-<form method="post" action="options-network.php">
+<form method="post" action="network.php">
 <?php
 function filestats( $err ) {
 ?>