Ticket #21871: 21871.5.diff

wp-admin/includes/screen.php

@@ -426 +426 @@
                         $id = sanitize_key( $id );
                         if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) {
                                 $maybe = substr( $id, 5 );
+                                if ( false !== strpos( $maybe, '-' ) ) {
+                                        $maybe = explode( '-', $maybe );
+                                        $maybe2 = $maybe[1];
+                                        $maybe = $maybe[0];
+                                }
                                 if ( taxonomy_exists( $maybe ) ) {
                                         $id = 'edit-tags';
                                         $taxonomy = $maybe;
+                                        if ( ! empty( $maybe2 ) )
+                                                $post_type = $maybe2;
                                 } elseif ( post_type_exists( $maybe ) ) {
                                         $id = 'edit';
                                         $post_type = $maybe;
@@ -496 +503 @@
                         case 'edit-tags' :
                                 if ( null === $taxonomy )
                                         $taxonomy = 'post_tag';
-                                $id = 'edit-' . $taxonomy;
+                                if ( null === $post_type )
+                                        $post_type = 'post';
+                                $id = 'edit-' . $taxonomy . '-' . $post_type;
                                 break;
                 }