From 5ff3240176a011386920f3f35cc42fd8134cccac Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Wed, 28 Dec 2005 00:45:13 +0000 Subject: [PATCH] Title fixes for plugin menu pages. fixes #1447 git-svn-id: https://develop.svn.wordpress.org/trunk@3367 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/admin-functions.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 7f0ed5e004..6f6d1b9af4 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1249,7 +1249,9 @@ function get_admin_page_title() { return $title; } - $parent = get_admin_page_parent(); + $hook = get_plugin_page_hook($plugin_page, $pagenow); + + $parent = $parent1 = get_admin_page_parent(); if (empty ($parent)) { foreach ($menu as $menu_array) { if (isset ($menu_array[3])) { @@ -1257,7 +1259,7 @@ function get_admin_page_title() { $title = $menu_array[3]; return $menu_array[3]; } else - if (isset ($plugin_page) && ($plugin_page == $menu_array[2])) { + if (isset ($plugin_page) && ($plugin_page == $menu_array[2]) && ($hook == $menu_array[3])) { $title = $menu_array[3]; return $menu_array[3]; } @@ -1271,7 +1273,7 @@ function get_admin_page_title() { $title = $submenu_array[3]; return $submenu_array[3]; } else - if (isset ($plugin_page) && ($plugin_page == $submenu_array[2])) { + if (isset ($plugin_page) && ($plugin_page == $submenu_array[2]) && (($parent == $pagenow) || ($parent == $plugin_page) || ($plugin_page == $hook) || (($pagenow == 'admin.php') && ($parent1 != $submenu_array[2])))) { $title = $submenu_array[3]; return $submenu_array[3]; }