From c3b1b5d5e33ec57503e17dfdf2cc8ece9191751e Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 29 Nov 2008 18:09:09 +0000
Subject: [PATCH] Fix menu parents. see #8421

git-svn-id: http://svn.automattic.com/wordpress/trunk@9967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-pages.php    | 2 +-
 wp-admin/link-category.php | 2 +-
 wp-admin/link-import.php   | 5 +++--
 wp-admin/link-manager.php  | 2 +-
 wp-admin/media-upload.php  | 2 +-
 wp-admin/update-core.php   | 6 +++---
 wp-admin/update.php        | 2 +-
 wp-admin/upload.php        | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index cf3e7fd15..bda3a4bfc 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -67,7 +67,7 @@ if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2']
 
 if ( empty($title) )
 	$title = __('Edit Pages');
-$parent_file = 'edit.php';
+$parent_file = 'edit-pages.php';
 wp_enqueue_script('inline-edit-post');
 
 $post_stati  = array(	//	array( adj, noun )
diff --git a/wp-admin/link-category.php b/wp-admin/link-category.php
index 05145c86e..bcfbf2e87 100644
--- a/wp-admin/link-category.php
+++ b/wp-admin/link-category.php
@@ -62,7 +62,7 @@ break;
 
 case 'edit':
 	$title = __('Edit Category');
-	$parent_file = 'edit.php';
+	$parent_file = 'link-manager.php';
 	$submenu_file = 'edit-link-categories.php';
 	require_once ('admin-header.php');
 	$cat_ID = (int) $_GET['cat_ID'];
diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php
index 8641eb627..9d4d354ba 100644
--- a/wp-admin/link-import.php
+++ b/wp-admin/link-import.php
@@ -10,7 +10,8 @@
 
 /** Load WordPress Administration Bootstrap */
 require_once('admin.php');
-$parent_file = 'edit.php';
+$parent_file = 'tools.php';
+$submenu_file = 'import.php';
 $title = __('Import Blogroll');
 
 $step = $_POST['step'];
@@ -141,4 +142,4 @@ if ( ! $blogrolling )
 
 include('admin-footer.php');
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index ce3dcaeff..0b1f91e3b 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -41,7 +41,7 @@ if ( empty($order_by) )
 	$order_by = 'order_name';
 
 $title = __('Edit Links');
-$this_file = $parent_file = 'edit.php';
+$this_file = $parent_file = 'link-manager.php';
 include_once ("./admin-header.php");
 
 if (!current_user_can('manage_links'))
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index fd3a649fa..673aea1a2 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -53,7 +53,7 @@ if ( isset($_GET['inline']) ) {
 	}
 
 	$title = __('Upload New Media');
-	$parent_file = 'edit.php';
+	$parent_file = 'upload.php';
 	require_once('admin-header.php'); ?>
 	<div class="wrap">
 	<?php screen_icon(); ?>
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 37c964cbb..edf894dc0 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -195,14 +195,14 @@ $action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core';
 	
 if ( 'upgrade-core' == $action ) {
 	$title = __('Upgrade WordPress');
-	$parent_file = 'index.php';
+	$parent_file = 'tools.php';
 	require_once('admin-header.php');
 	core_upgrade_preamble();
 	include('admin-footer.php');
 } elseif ( 'do-core-upgrade' == $action ) {
 	check_admin_referer('upgrade-core');
 	$title = __('Upgrade WordPress');
-	$parent_file = 'index.php';
+	$parent_file = 'tools.php';
 	// do the (un)dismiss actions before headers,
 	// so that they can redirect
 	if ( isset( $_POST['dismiss'] ) )
@@ -213,4 +213,4 @@ if ( 'upgrade-core' == $action ) {
 	if ( isset( $_POST['upgrade'] ) )
 		do_core_upgrade();
 	include('admin-footer.php');
-}?>
\ No newline at end of file
+}?>
diff --git a/wp-admin/update.php b/wp-admin/update.php
index 7ed10489c..dcc3ff991 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -130,7 +130,7 @@ if ( isset($_GET['action']) ) {
 	if ( 'upgrade-plugin' == $action ) {
 		check_admin_referer('upgrade-plugin_' . $plugin);
 		$title = __('Upgrade Plugin');
-		$parent_file = 'index.php';
+		$parent_file = 'plugins.php';
 		require_once('admin-header.php');
 		do_plugin_upgrade($plugin);
 		include('admin-footer.php');
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 20459e6de..017d8fc6c 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -101,7 +101,7 @@ if ( isset($_GET['find_detached'] ) ) {
 }
 
 $title = __('Media Library');
-$parent_file = 'edit.php';
+$parent_file = 'upload.php';
 
 if ( ! isset( $_GET['paged'] ) || $_GET['paged'] < 1 )
 	$_GET['paged'] = 1;