Changeset 19097

Timestamp:

10/31/2011 09:28:17 PM (13 years ago)

Author:

nacin

Message:

Consistently set taxnow/typenow and the current screen's post_type/taxnomy, whenever it can be detected. Allow WP_Screen::get() to accept a post type as a hook_name. Fixes issues with the meta box $page/$screen argument. fixes #19080. see #18785.

Location:

trunk/wp-admin

Files:

• admin.php (modified) (1 diff)
• includes/screen.php (modified) (4 diffs)

trunk/wp-admin/admin.php

@@ -89 +89 @@
 }
 
-if ( isset($_GET['post_type']) )
-    $typenow = sanitize_key($_GET['post_type']);
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+    $typenow = $_REQUEST['post_type'];
 else
     $typenow = '';
 
-if ( isset($_GET['taxonomy']) )
-    $taxnow = sanitize_key($_GET['taxonomy']);
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+    $taxnow = $_REQUEST['taxonomy'];
 else
     $taxnow = '';

trunk/wp-admin/includes/screen.php

@@ -419 +419 @@
 
             $id = sanitize_key( $id );
-            if ( false !== strpos( $id, '-' ) ) {
+            if ( post_type_exists( $id ) ) {
+                $post_type = $id;
+                $id = 'post'; // changes later. ends up being $base.
+            } elseif ( false !== strpos( $id, '-' ) ) {
                 list( $id, $second ) = explode( '-', $id, 2 );
                 if ( taxonomy_exists( $second ) ) {
@@ -439 +442 @@
         // 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'];
+
             switch ( $base ) {
                 case 'post' :
@@ -452 +460 @@
                         if ( $post )
                             $post_type = $post->post_type;
-                    } elseif ( isset( $_POST['post_type'] ) && post_type_exists( $_POST['post_type'] ) ) {
-                        $post_type = $_POST['post_type'];
-                    } elseif ( $action == 'add' && isset( $_GET['post_type'] ) && post_type_exists( $_GET['post_type'] ) ) {
-                        $post_type = $_GET['post_type'];
                     }
                     break;
-                case 'edit' :
-                    if ( isset( $_GET['post_type'] ) && post_type_exists( $_GET['post_type'] ) )
-                        $post_type = $_GET['post_type'];
-                    break;
                 case 'edit-tags' :
-                    if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
-                        $taxonomy = $_REQUEST['taxonomy'];
-                    if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
-                        $post_type = $_REQUEST['post_type'];
-                    else if ( is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
+                    if ( ! $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
                         $post_type = 'post';
                     break;
@@ -499 +495 @@
         }
 
-        if ( isset( self::$_registry[ $id ] ) )
-            return self::$_registry[ $id ];
-
-        $screen = new WP_Screen();
-        $screen->id         = $id;
+        if ( isset( self::$_registry[ $id ] ) ) {
+            $screen = self::$_registry[ $id ];
+            if ( $screen === get_current_screen() )
+                return $screen;
+        } else {
+            $screen = new WP_Screen();
+            $screen->id     = $id;
+        }
+
         $screen->base       = $base;
         $screen->action     = $action;