vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't fallback to default post type or taxonomy if given an invalid post type or taxonomy. Use typenow as the canonical post type. Props nacin. see #19131

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@19321 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2011-11-17 18:01:08 +00:00
parent 914a945108
commit f626327800
4 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/includes/screen.php
+11 -11
View File
@@ -399,7 +399,7 @@ final class WP_Screen {
if ( is_a( $hook_name, 'WP_Screen' ) )
return $hook_name;
$action = $post_type = $taxonomy = '';
$action = $post_type = $taxonomy = null;
$is_network = $is_user = false;
if ( $hook_name )
@@ -447,10 +447,10 @@ final class WP_Screen {
// If this is the current screen, see if we can be more accurate for post types and taxonomies.
if ( ! $hook_name ) {
if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
$post_type = $_REQUEST['post_type'];
if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
$taxonomy = $_REQUEST['taxonomy'];
if ( isset( $_REQUEST['post_type'] ) )
$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
if ( isset( $_REQUEST['taxonomy'] ) )
$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
switch ( $base ) {
case 'post' :
@@ -468,7 +468,7 @@ final class WP_Screen {
}
break;
case 'edit-tags' :
if ( ! $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
$post_type = 'post';
break;
}
@@ -476,17 +476,17 @@ final class WP_Screen {
switch ( $base ) {
case 'post' :
if ( ! $post_type )
if ( null === $post_type )
$post_type = 'post';
$id = $post_type;
break;
case 'edit' :
if ( ! $post_type )
if ( null === $post_type )
$post_type = 'post';
$id .= '-' . $post_type;
break;
case 'edit-tags' :
if ( ! $taxonomy )
if ( null === $taxonomy )
$taxonomy = 'post_tag';
$id = 'edit-' . $taxonomy;
break;
@@ -511,8 +511,8 @@ final class WP_Screen {
$screen->base = $base;
$screen->action = $action;
$screen->post_type = $post_type;
$screen->taxonomy = $taxonomy;
$screen->post_type = (string) $post_type;
$screen->taxonomy = (string) $taxonomy;
$screen->is_user = $is_user;
$screen->is_network = $is_network;