Changeset 3367

Timestamp:

12/28/2005 12:45:13 AM (19 years ago)

Author:

ryan

Message:

Title fixes for plugin menu pages. fixes #1447

File:

• trunk/wp-admin/admin-functions.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -1250 +1250 @@
     }
 
-    $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) {
@@ -1258 +1260 @@
                     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];
@@ -1272 +1274 @@
                         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];