Ticket #21871: 21871-guid.5.diff

wp-admin/includes/screen.php

@@ -237 +237 @@
         /**
          * The unique ID of the screen.
          *
+         * @since 3.5.0
+         * @var string
+         * @access public
+         */
+        public $guid = '';
+
+        /**
+         * The somewhat unique ID of the screen.
+         *
          * @since 3.3.0
          * @var string
          * @access public
@@ -391 +400 @@
                 if ( is_a( $hook_name, 'WP_Screen' ) )
                         return $hook_name;
 
+                if ( false !== strpos( $hook_name, ':' ) )
+                        $_screen = WP_Screen::get_from_guid( $hook_name );
+                else
+                        $_screen = WP_Screen::get_from_hook( $hook_name );
+
+                if ( isset( self::$_registry[ $_screen->id ] ) ) {
+                        $screen = self::$_registry[ $_screen->id ];
+                        if ( $screen === get_current_screen() )
+                                return $screen;
+                        unset( $_screen->id );
+                } else {
+                        $screen = new WP_Screen();
+                }
+
+                foreach ( get_object_vars( $_screen ) as $property => $value ) {
+                        $screen->$property = $value;
+                }
+
+                self::$_registry[ $_screen->id ] = $screen;
+
+                return $screen;
+        }
+
+        public static function get_from_guid( $guid ) {
+                $screen = new stdClass;
+
+                // admin:page:arg1:arg2:arg3:...
+                $screen->guid = $guid;
+                $bits = explode( ':', $guid );
+                $screen->in_admin = $bits[0];
+                $screen->is_user    = ( 'user' == $in_admin );
+                $screen->is_network = ( 'network' == $in_admin );
+                $screen->base = $screen->id = $bits[1];
+                $screen->taxonomy = '';
+                $screen->post_type = '';
+
+                switch (  $screen->id ) {
+                        case 'edit-tags':
+                                $screen->taxonomy = $bits[2];
+                                if ( ! empty( $bits[3] ) )
+                                        $screen->post_type = $bits[3];
+                                $screen->id = 'edit-' . $screen->taxonomy;
+                                break;
+                        case 'edit':
+                                $screen->post_type = $bits[2];
+                                $screen->id = 'edit-' . $screen->post_type;
+                                break;
+                        case 'post':
+                                $screen->post_type = $bits[2];
+                                $screen->action = 'add';
+                                break;
+                        case 'media':
+                        case 'link':
+                        case 'user':
+                                $screen->action = 'add';
+                                break;
+                }
+
+                if ( 'site' != $screen->in_admin ) {
+                        $screen->base .= '-' . $screen->in_admin;
+                        $screen->id .= '-' . $screen->in_admin;
+                }
+
+                return $screen;
+        }
+
+        public static function get_from_hook( $hook_name = '' ) {
                 $post_type = $taxonomy = null;
                 $in_admin = false;
                 $action = '';
@@ -408 +484 @@
                         if ( '.php' == substr( $id, -4 ) )
                                 $id = substr( $id, 0, -4 );
 
-                        if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) {
+                        if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id || 'site-new' == $id ) {
                                 $id = substr( $id, 0, -4 );
                                 $action = 'add';
                         }
@@ -437 +513 @@
 
                         if ( ! $in_admin )
                                 $in_admin = 'site';
-                } else {
+                } elseif ( ! $in_admin ) {
                         if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN )
                                 $in_admin = 'network';
                         elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN )
@@ -508 +584 @@
                         $base .= '-user';
                 }
 
-                if ( isset( self::$_registry[ $id ] ) ) {
-                        $screen = self::$_registry[ $id ];
-                        if ( $screen === get_current_screen() )
-                                return $screen;
-                } else {
-                        $screen = new WP_Screen();
-                        $screen->id     = $id;
+                // @todo create guid
+                $screen = new stdClass;
+                $screen->guid = $in_admin . ':' . $base;
+
+                switch ( $base ) {
+                        case 'edit-tags':
+                                $screen->guid .= ':' . $taxonomy;
+                                if ( $post_type )
+                                        $screen->guid .= ':' . $post_type;
+                                break;
+                        case 'edit':
+                        case 'post':
+                                $screen->guid .= ':' . $post_type;
+                                break;
                 }
 
+                $screen->id         = $id;
                 $screen->base       = $base;
                 $screen->action     = $action;
                 $screen->post_type  = (string) $post_type;
@@ -525 +609 @@
                 $screen->is_network = ( 'network' == $in_admin );
                 $screen->in_admin   = $in_admin;
 
-                self::$_registry[ $id ] = $screen;
-
                 return $screen;
-        }
+        }
 
         /**
          * Makes the screen object the current screen.

wp-admin/edit-tags.php

@@ -351 +351 @@
 <h3><?php echo $tax->labels->add_new_item; ?></h3>
 <form id="addtag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="add-tag" />
-<input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
+<input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->guid); ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 <?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>