Changeset 15253

Timestamp:

06/14/2010 07:33:04 PM (15 years ago)

Author:

ryan

Message:

Differentiate between edit and new via an action field for the screen. Fix favorite_actions(). fixes #13876

File:

• trunk/wp-admin/includes/template.php (modified) (5 diffs)

trunk/wp-admin/includes/template.php

@@ -3317 +3317 @@
  */
 function favorite_actions( $screen = null ) {
-    global $post_type_object;
-
     $default_action = false;
 
@@ -3324 +3322 @@
         $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 ( isset($screen->post_type) ) {
+        $post_type_object = get_post_type_object($screen->post_type);
+        if ( 'add' != $screen->action )
+            $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));
+        else
+            $default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->name, $post_type_object->cap->edit_posts));
     }
 
@@ -3344 +3339 @@
                 break;
             case 'link-manager':
-                $default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
-                break;
-            case 'link-add':
-                $default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
+            case 'link':
+                if ( 'add' != $screen->action )
+                    $default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
+                else
+                    $default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
                 break;
             case 'users':
@@ -3903 +3899 @@
     global $current_screen, $hook_suffix, $typenow, $taxnow;
 
+    $action = '';
+
     if ( empty($id) ) {
         $current_screen = $hook_suffix;
         $current_screen = str_replace('.php', '', $current_screen);
+        if ( preg_match('/-add|-new$/', $current_screen) )
+            $action = 'add';
         $current_screen = str_replace('-new', '', $current_screen);
         $current_screen = str_replace('-add', '', $current_screen);
@@ -3923 +3923 @@
 
     $current_screen = (object) $current_screen;
+
+    $current_screen->action = $action;
 
     // Map index to dashboard