sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

git-svn-id: https://develop.svn.wordpress.org/trunk@14126 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2010-04-18 02:56:00 +00:00
parent 632de8561e
commit 2d50f72462
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-admin/includes/plugin.php
View File

@ -1242,6 +1242,7 @@ function get_admin_page_title() {
global $submenu; global $submenu;
global $pagenow; global $pagenow;
global $plugin_page; global $plugin_page;
global $typenow;
if ( ! empty ( $title ) ) if ( ! empty ( $title ) )
return $title; return $title;
@ -1267,11 +1268,17 @@ function get_admin_page_title() {
} }
} }
} else { } else {
foreach (array_keys( $submenu ) as $parent) { foreach ( array_keys( $submenu ) as $parent ) {
foreach ( $submenu[$parent] as $submenu_array ) { foreach ( $submenu[$parent] as $submenu_array ) {
if ( isset( $plugin_page ) && if ( isset( $plugin_page ) &&
($plugin_page == $submenu_array[2] ) && ( $plugin_page == $submenu_array[2] ) &&
(($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) && ($parent1 != $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]; $title = $submenu_array[3];
return $submenu_array[3]; return $submenu_array[3];
@ -1292,9 +1299,9 @@ function get_admin_page_title() {
if ( empty ( $title ) ) { if ( empty ( $title ) ) {
foreach ( $menu as $menu_array ) { foreach ( $menu as $menu_array ) {
if ( isset( $plugin_page ) && if ( isset( $plugin_page ) &&
($plugin_page == $menu_array[2] ) && ( $plugin_page == $menu_array[2] ) &&
($pagenow == 'admin.php' ) && ( $pagenow == 'admin.php' ) &&
($parent1 == $menu_array[2] ) ) ( $parent1 == $menu_array[2] ) )
{ {
$title = $menu_array[3]; $title = $menu_array[3];
return $menu_array[3]; return $menu_array[3];
@ -1330,10 +1337,9 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) {
$page_type = $admin_page_hooks[$parent]; $page_type = $admin_page_hooks[$parent];
} }
$plugin_name = preg_replace( '!\.php!', '', $plugin_page ); $plugin_name = preg_replace( '!\.php!', '', $plugin_page );
return $page_type.'_page_'.$plugin_name; return $page_type . '_page_' . $plugin_name;
} }
function user_can_access_admin_page() { function user_can_access_admin_page() {