WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make convert_to_screen() more resilient. see #18785. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-10-25 06:54:23 +00:00
parent f9d807d649
commit 68225fdf13
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wp-admin/includes/screen.php
View File

@ -401,12 +401,23 @@ final class WP_Screen {
$action = $post_type = $taxonomy = '';
if ( $hook_name )
$id = $hook_name;
else
$id = $GLOBALS['hook_suffix'];
$id = str_replace( '.php', '', $id );
if ( in_array( substr( $id, -4 ), array( '-add', '-new' ) ) )
$action = 'add';
$id = str_replace( array( '-new', '-add' ), '', $id );
if ( $hook_name ) {
if ( '-network' == substr( $hook_name, -8 ) )
$hook_name = str_replace( '-network', '', $hook_name );
elseif ( '-user' == substr( $hook_name, -5 ) )
$hook_name = str_replace( '-user', '', $hook_name );
$id = sanitize_key( $hook_name );
if ( '-network' == substr( $id, -8 ) )
$id = str_replace( '-network', '', $id );
elseif ( '-user' == substr( $id, -5 ) )
$id = str_replace( '-user', '', $id );
$id = sanitize_key( $id );
if ( false !== strpos( $id, '-' ) ) {
list( $id, $second ) = explode( '-', $id, 2 );
if ( taxonomy_exists( $second ) ) {
@ -418,12 +429,6 @@ final class WP_Screen {
$id .= '-' . $second;
}
}
} else {
$id = $GLOBALS['hook_suffix'];
$id = str_replace( '.php', '', $id );
if ( in_array( substr( $id, -4 ), array( '-add', '-new' ) ) )
$action = 'add';
$id = str_replace( array( '-new', '-add' ), '', $id );
}
if ( 'index' == $id )