Changeset 19108

Timestamp:

11/01/2011 09:36:04 PM (13 years ago)

Author:

nacin

Message:

Use more obvious variables in WP_Screen. see #18785.

File:

• trunk/wp-admin/includes/screen.php (modified) (1 diff)

trunk/wp-admin/includes/screen.php

@@ -420 +420 @@
             $id = sanitize_key( $id );
             if ( post_type_exists( $id ) ) {
+                $id = 'post'; // changes later. ends up being $base.
                 $post_type = $id;
-                $id = 'post'; // changes later. ends up being $base.
             } elseif ( false !== strpos( $id, '-' ) ) {
-                list( $id, $second ) = explode( '-', $id, 2 );
+                list( $first, $second ) = explode( '-', $id, 2 );
                 if ( taxonomy_exists( $second ) ) {
                     $id = 'edit-tags';
                     $taxonomy = $second;
                 } elseif ( post_type_exists( $second ) ) {
+                    $id = $first;
                     $post_type = $second;
-                } else {
-                    $id .= '-' . $second;
-                }
+                }
             }
         }