Ticket #13876: 13876.diff

wp-admin/includes/template.php

@@ -3316 +3316 @@
  * @since unknown
  */
 function favorite_actions( $screen = null ) {
-        global $post_type_object;
+        global $post_type_object, $hook_suffix;
 
         $default_action = false;
 
@@ -3324 +3324 @@
                 $screen = convert_to_screen($screen);
 
         if ( isset($post_type_object) ) {
-                switch ( $screen->id ) {
-                        case $post_type_object->name:
-                                $default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->edit_item, $post_type_object->cap->edit_posts));
-                                break;
-                        case "edit-{$post_type_object->name}":
-                                $default_action = array('post-new.php?post_type=' . $post_type_object->name => array($post_type_object->labels->new_item, $post_type_object->cap->edit_posts));
-                                break;
-                }
+                if ( "edit-{$post_type_object->name}" == $screen->id || 'post.php' == $hook_suffix )
+                        $default_action = array('post-new.php?post_type=' . $post_type_object->name => array($post_type_object->labels->new_item, $post_type_object->cap->edit_posts));
+                elseif ( $post_type_object->name == $screen->id )
+                        $default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->edit_item, $post_type_object->cap->edit_posts));
         }
 
-        if ( !$default_action ) {
+        if ( ! $default_action ) {
                 switch ( $screen->id ) {
                         case 'upload':
                                 $default_action = array('media-new.php' => array(__('New Media'), 'upload_files'));