Changeset 19321

Timestamp:

11/17/2011 06:01:08 PM (15 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-admin

Files:

• edit.php (modified) (1 diff)
• includes/class-wp-posts-list-table.php (modified) (1 diff)
• includes/screen.php (modified) (5 diffs)
• includes/template.php (modified) (1 diff)

trunk/wp-admin/edit.php

@@ -10 +10 @@
 require_once( './admin.php' );
 
-if ( !isset($_GET['post_type']) )
-        $post_type = 'post';
-elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) )
-        $post_type = $_GET['post_type'];
-else
-        wp_die( __('Invalid post type') );
-
-$_GET['post_type'] = $post_type;
-
+if ( ! $typenow )
+        wp_die( __( 'Invalid post type' ) );
+
+$post_type = $typenow;
 $post_type_object = get_post_type_object( $post_type );
 
-if ( !current_user_can($post_type_object->cap->edit_posts) )
-        wp_die(__('Cheatin’ uh?'));
+if ( ! $post_type_object )
+        wp_die( __( 'Invalid post type' ) );
+
+if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
+        wp_die( __( 'Cheatin’ uh?' ) );
 
 $wp_list_table = _get_list_table('WP_Posts_List_Table');

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -49 +49 @@
                 global $post_type_object, $wpdb;
 
-                if ( !isset( $_REQUEST['post_type'] ) )
-                        $post_type = 'post';
-                elseif ( in_array( $_REQUEST['post_type'], get_post_types( array( 'show_ui' => true ) ) ) )
-                        $post_type = $_REQUEST['post_type'];
-                else
-                        wp_die( __( 'Invalid post type' ) );
-                $_REQUEST['post_type'] = $post_type;
-
+                $post_type = get_current_screen()->post_type;
                 $post_type_object = get_post_type_object( $post_type );
 

trunk/wp-admin/includes/screen.php

@@ -400 +400 @@
                         return $hook_name;
 
-                $action = $post_type = $taxonomy = '';
+                $action = $post_type = $taxonomy = null;
                 $is_network = $is_user = false;
 
@@ -448 +448 @@
                 // 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 ) {
@@ -469 +469 @@
                                         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;
@@ -477 +477 @@
                 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;
@@ -512 +512 @@
                 $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;

trunk/wp-admin/includes/template.php

@@ -1393 +1393 @@
         ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
         pagenow = '<?php echo $current_screen->id; ?>',
-        typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+        typenow = '<?php echo $current_screen->post_type; ?>',
         adminpage = '<?php echo $admin_body_class; ?>',
         thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',