Changeset 14126 for trunk/wp-admin/includes/plugin.php

Timestamp:

04/18/2010 02:56:00 AM (15 years ago)

Author:

dd32

Message:

Check $pagenow?post_type=$typenow for submenu titles, Fixes page titles for plugin pages added to custom post_type's. Fixes #12985

File:

• trunk/wp-admin/includes/plugin.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin.php

@@ -1243 +1243 @@
     global $pagenow;
     global $plugin_page;
+    global $typenow;
 
     if ( ! empty ( $title ) )
@@ -1268 +1269 @@
         }
     } else {
-        foreach (array_keys( $submenu ) as $parent) {
+        foreach ( array_keys( $submenu ) as $parent ) {
             foreach ( $submenu[$parent] as $submenu_array ) {
                 if ( isset( $plugin_page ) &&
-                    ($plugin_page == $submenu_array[2] ) &&
-                    (($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) && ($parent1 != $submenu_array[2] ) ) )
+                    ( $plugin_page == $submenu_array[2] ) &&
+                    (
+                        ( $parent == $pagenow ) ||
+                        ( $parent == $plugin_page ) ||
+                        ( $plugin_page == $hook ) ||
+                        ( $pagenow == 'admin.php' && $parent1 != $submenu_array[2] ) ||
+                        ( !empty($typenow) && $parent == $pagenow . '?post_type=' . $typenow)
+                    )
                     ) {
                         $title = $submenu_array[3];
@@ -1293 +1300 @@
             foreach ( $menu as $menu_array ) {
                 if ( isset( $plugin_page ) &&
-                    ($plugin_page == $menu_array[2] ) &&
-                    ($pagenow == 'admin.php' ) &&
-                    ($parent1 == $menu_array[2] ) )
+                    ( $plugin_page == $menu_array[2] ) &&
+                    ( $pagenow == 'admin.php' ) &&
+                    ( $parent1 == $menu_array[2] ) )
                     {
                         $title = $menu_array[3];
@@ -1331 +1338 @@
     }
 
-
     $plugin_name = preg_replace( '!\.php!', '', $plugin_page );
 
-    return $page_type.'_page_'.$plugin_name;
+    return $page_type . '_page_' . $plugin_name;
 }