From 5aa7cbcf37f2c6252736355446447d51c74b7383 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 21 Aug 2008 23:18:51 +0000
Subject: [PATCH] Move Setting menu to top-level. see #7552

git-svn-id: http://svn.automattic.com/wordpress/trunk@8705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php               | 20 ++++++++++----------
 wp-admin/options-discussion.php |  3 ---
 wp-admin/options-general.php    |  4 +---
 wp-admin/options-misc.php       |  3 ---
 wp-admin/options-permalink.php  |  3 ---
 wp-admin/options-privacy.php    |  3 ---
 wp-admin/options-reading.php    |  3 ---
 wp-admin/options-writing.php    |  3 ---
 8 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index d100464a6c..9181c91461 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -61,17 +61,17 @@ $menu[15] = array( __('Utilities'), 'read', 'users.php' ); // placeholder - shou
 	$submenu['users.php'][25] = array( __('Users'), 'edit_users', 'users.php' );
 	$submenu['users.php'][30] = array( __('Import'), 'import', 'import.php' );
 	$submenu['users.php'][35] = array( __('Export'), 'import', 'export.php' );
-	$submenu['users.php'][40] = array( __('Settings'), 'manage_options', 'options-general.php' );
-		$_wp_real_parent_file['options-general.php'] = 'users.php';
-		$submenu['options-general.php'][10] = array( __('General'), 'manage_options', 'options-general.php' );
-		$submenu['options-general.php'][15] = array( __('Writing'), 'manage_options', 'options-writing.php' );
-		$submenu['options-general.php'][20] = array( __('Reading'), 'manage_options', 'options-reading.php' );
-		$submenu['options-general.php'][25] = array( __('Discussion'), 'manage_options', 'options-discussion.php' );
-		$submenu['options-general.php'][30] = array( __('Privacy'), 'manage_options', 'options-privacy.php' );
-		$submenu['options-general.php'][35] = array( __('Permalinks'), 'manage_options', 'options-permalink.php' );
-		$submenu['options-general.php'][40] = array( __('Miscellaneous'), 'manage_options', 'options-misc.php' );
 
-$menu[20] = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
+$menu[20] = array(__('Settings'), 'manage_options', 'options-general.php');
+	$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
+	$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
+	$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
+	$submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
+	$submenu['options-general.php'][30] = array(__('Privacy'), 'manage_options', 'options-privacy.php');
+	$submenu['options-general.php'][35] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
+	$submenu['options-general.php'][40] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
+
+$menu[25] = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
 	$submenu['plugins.php'][5]  = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
 	$submenu['plugins.php'][10] = array( __('Plugin Editor'), 'edit_plugins', 'plugin-editor.php' );
 
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index fbc4851b23..00ca9a0238 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -16,9 +16,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
 <h2><?php _e('Discussion Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 00d20d1a11..64f00500e4 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -10,14 +10,12 @@
 require_once('./admin.php');
 
 $title = __('General Settings');
+$parent_file = 'options-general.php';
 
 include('./admin-header.php');
 ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
 <h2><?php _e('General Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index fdea35e014..cb1998442b 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -17,9 +17,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
 <h2><?php _e('Miscellaneous Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 8ba38bfad5..689c83a6db 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -123,9 +123,6 @@ else
 <?php endif; ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
   <h2><?php _e('Customize Permalink Structure') ?></h2>
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index c1ab9ff698..9e3d9cad82 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -16,9 +16,6 @@ include('./admin-header.php');
 ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
 <h2><?php _e('Privacy Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 04c06828d7..39ecab9a5d 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -16,9 +16,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
 <h2><?php _e('Reading Settings') ?></h2>
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 88189eff3c..6f0ed91bd3 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -16,9 +16,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<ul class="wp-menu">
-<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
-</ul>
 <h2><?php _e('Writing Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>