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

Timestamp:

01/12/2010 04:50:37 PM (15 years ago)

Author:

ryan

Message:

Merge page.php into post.php. see #9674

File:

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

trunk/wp-admin/post.php

@@ -17 +17 @@
 wp_reset_vars(array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder'));
 
+if ( isset($_GET['post']) )
+    $post_id = (int) $_GET['post'];
+elseif ( isset($_POST['post_ID']) )
+    $post_id = (int) $_POST['post_ID'];
+else
+    $post_id = 0;
+$post_ID = $post_id;
+
+$post = null;
+$post_type_object = null;
+$post_type_cap = 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 )
+            $post_type_cap = $post_type_object->capability_type;
+    }
+}
+
 /**
  * Redirect to previous page.
  *
- * @param int $post_ID Optional. Post ID.
+ * @param int $post_id Optional. Post ID.
  */
-function redirect_post($post_ID = '') {
+function redirect_post($post_id = '') {
     global $action;
 
@@ -38 +58 @@
             $location = 'sidebar.php?a=b';
     } elseif ( isset($_POST['save']) || isset($_POST['publish']) ) {
-        $status = get_post_status( $post_ID );
+        $status = get_post_status( $post_id );
 
         if ( isset( $_POST['publish'] ) ) {
@@ -55 +75 @@
         }
 
-        $location = add_query_arg( 'message', $message, get_edit_post_link( $post_ID, 'url' ) );
+        $location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
     } elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
         $location = add_query_arg( 'message', 2, wp_get_referer() );
@@ -65 +85 @@
         $location = $location[0] . '#postcustom';
     } elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) {
-        $location = "post.php?action=edit&post=$post_ID&message=7";
-    } else {
-        $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) );
-    }
-
-    wp_redirect( apply_filters( 'redirect_post_location', $location, $post_ID ) );
+        $location = "post.php?action=edit&post=$post_id&message=7";
+    } else {
+        $location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
+    }
+
+    wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
 }
 
@@ -101 +121 @@
     if ( !empty( $_POST['quickpress_post_ID'] ) ) {
         $_POST['post_ID'] = (int) $_POST['quickpress_post_ID'];
-        $post_ID = edit_post();
-    } else {
-        $post_ID = 'postajaxpost' == $action ? edit_post() : write_post();
+        $post_id = edit_post();
+    } else {
+        $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
     }
 
     if ( 0 === strpos( $action, 'post-quickpress' ) ) {
-        $_POST['post_ID'] = $post_ID;
+        $_POST['post_ID'] = $post_id;
         // output the quickpress dashboard widget
         require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
@@ -114 +134 @@
     }
 
-    redirect_post($post_ID);
+    redirect_post($post_id);
     exit();
     break;
@@ -121 +141 @@
     $editing = true;
 
-    if ( empty( $_GET['post'] ) ) {
+    if ( empty( $post_id ) ) {
         wp_redirect("post.php");
         exit();
     }
-    $post_ID = $p = (int) $_GET['post'];
-    $post = get_post($post_ID);
-    $post_type_object = get_post_type_object($post->post_type);
+
+    $p = $post_id;
 
     if ( empty($post->ID) )
-        wp_die( __('You attempted to edit a post that doesn’t exist. Perhaps it was deleted?') );
-
-    if ( !current_user_can('edit_post', $post_ID) )
-        wp_die( __('You are not allowed to edit this post.') );
+        wp_die( __('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?') );
+
+    if ( !current_user_can($post_type_object->edit_cap, $post_id) )
+        wp_die( __('You are not allowed to edit this item.') );
 
     if ( 'trash' == $post->post_status )
-        wp_die( __('You can’t edit this post because it is in the Trash. Please restore it and try again.') );
+        wp_die( __('You can’t edit this item because it is in the Trash. Please restore it and try again.') );
 
     if ( null == $post_type_object )
         wp_die( __('Unknown post type.') );
 
-    if ( 'post' != $post->post_type && $post_type_object->_builtin ) {
-        wp_redirect( get_edit_post_link( $post->ID, 'url' ) );
-        exit();
-    }
-
     $post_type = $post->post_type;
-    if ( 'post' != $post_type ) {
-        $parent_file = "edit.php?post_type=$post_type";
-        $submenu_file = "edit.php?post_type=$post_type";
+    if ( 'post' == $post_type ) {
+        $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";
+        }
     }
 
@@ -169 +194 @@
 
     $title = sprintf(__('Edit %s'), $post_type_object->label);
-    $post = get_post_to_edit($post_ID);
+    $post = get_post_to_edit($post_id);
 
     include('edit-form-advanced.php');
@@ -176 +201 @@
 
 case 'editattachment':
-    $post_id = (int) $_POST['post_ID'];
-
     check_admin_referer('update-attachment_' . $post_id);
 
@@ -191 +214 @@
 
 case 'editpost':
-    $post_ID = (int) $_POST['post_ID'];
-    check_admin_referer('update-post_' . $post_ID);
-
-    $post_ID = edit_post();
-
-    redirect_post($post_ID); // Send user on their way while we keep working
+    check_admin_referer('update-' . $post->post_type . '_' . $post_id);
+
+    $post_id = edit_post();
+
+    redirect_post($post_id); // Send user on their way while we keep working
 
     exit();
@@ -202 +224 @@
 
 case 'trash':
-    $post_id = isset($_GET['post']) ? intval($_GET['post']) : intval($_POST['post_ID']);
     check_admin_referer('trash-post_' . $post_id);
 
     $post = & get_post($post_id);
 
-    if ( !current_user_can('delete_post', $post_id) )
-        wp_die( __('You are not allowed to move this post to the trash.') );
+    if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+        wp_die( __('You are not allowed to move this item to the trash.') );
 
     if ( ! wp_trash_post($post_id) )
@@ -218 +239 @@
 
 case 'untrash':
-    $post_id = isset($_GET['post']) ? intval($_GET['post']) : intval($_POST['post_ID']);
     check_admin_referer('untrash-post_' . $post_id);
 
-    $post = & get_post($post_id);
-
-    if ( !current_user_can('delete_post', $post_id) )
-        wp_die( __('You are not allowed to move this post out of the trash.') );
+    if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+        wp_die( __('You are not allowed to move this item out of the trash.') );
 
     if ( ! wp_untrash_post($post_id) )
@@ -234 +252 @@
 
 case 'delete':
-    $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
     check_admin_referer('delete-post_' . $post_id);
 
-    $post = & get_post($post_id);
-
-    if ( !current_user_can('delete_post', $post_id) )
-        wp_die( __('You are not allowed to delete this post.') );
+    if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+        wp_die( __('You are not allowed to delete this item.') );
 
     $force = !EMPTY_TRASH_DAYS;
@@ -266 +281 @@
 
 default:
-    wp_redirect('edit.php');
+    if ( $post_type_object->hierarchical )
+        wp_redirect('edit-pages.php');
+    else
+        wp_redirect('edit.php');
     exit();
     break;