Changeset 12728 for trunk/wp-admin/post.php

Timestamp:

01/15/2010 04:58:36 PM (17 years ago)

Author:

ryan

Message:

Merge edit-pages.php into edit.php. see #9674

File:

• trunk/wp-admin/post.php (modified) (8 diffs)

trunk/wp-admin/post.php

@@ -24 +24 @@
         $post_id = 0;
 $post_ID = $post_id;
-
 $post = null;
 $post_type_object = null;
 $post_type_cap = null;
+$post_type = null;
 if ( $post_id ) {
         $post = get_post($post_id);
         if ( $post ) {
                 $post_type_object = get_post_type_object($post->post_type);
-                if ( $post_type_object )
+                if ( $post_type_object ) {
+                        $post_type = $post->post_type;
+                        $current_screen->post_type = $post->post_type;
+                        $current_screen->id = $current_screen->post_type;
                         $post_type_cap = $post_type_object->capability_type;
+                }
+        }
+} elseif ( isset($_POST['post_type']) ) {
+        $post_type_object = get_post_type_object($_POST['post_type']);
+        if ( $post_type_object ) {
+                $post_type = $post_type_object->name;
+                $current_screen->post_type = $post_type;
+                $current_screen->id = $current_screen->post_type;
+                $post_type_cap = $post_type_object->capability_type;
         }
 }
@@ -109 +121 @@
 case 'post-quickpress-publish':
 case 'post-quickpress-save':
-        check_admin_referer('add-post');
+        check_admin_referer('add-' . $post_type);
 
         if ( 'post-quickpress-publish' == $action )
@@ -164 +176 @@
                 $parent_file = "edit.php";
                 $submenu_file = "edit.php";
-        } elseif ( 'page' == $post_type ) {
-                $parent_file = "edit-pages.php";
-                $submenu_file = "edit-pages.php";
-        } else {
-                if ( $post_type_object->hierarchical ) {
-                        $parent_file = "edit-pages.php?post_type=$post_type";
-                        $submenu_file = "edit-pages.php?post_type=$post_type";
-                } else {
-                        $parent_file = "edit.php?post_type=$post_type";
-                        $submenu_file = "edit.php?post_type=$post_type";
-                }
+        } else {
+                $parent_file = "edit.php?post_type=$post_type";
+                $submenu_file = "edit.php?post_type=$post_type";
         }
 
@@ -214 +218 @@
 
 case 'editpost':
-        check_admin_referer('update-' . $post->post_type . '_' . $post_id);
+        check_admin_referer('update-' . $post_type . '_' . $post_id);
 
         $post_id = edit_post();
@@ -224 +228 @@
 
 case 'trash':
-        check_admin_referer('trash-post_' . $post_id);
+        check_admin_referer('trash-' . $post_type . '_' . $post_id);
 
         $post = & get_post($post_id);
@@ -239 +243 @@
 
 case 'untrash':
-        check_admin_referer('untrash-post_' . $post_id);
+        check_admin_referer('untrash-' . $post_type . '_' . $post_id);
 
         if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
@@ -252 +256 @@
 
 case 'delete':
-        check_admin_referer('delete-post_' . $post_id);
+        check_admin_referer('delete-' . $post_type . '_' . $post_id);
 
         if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
@@ -281 +285 @@
 
 default:
-        if ( $post_type_object->hierarchical )
-                wp_redirect('edit-pages.php');
-        else
                 wp_redirect('edit.php');
         exit();