Changeset 26144 for trunk/src/wp-admin/post.php

Timestamp:

11/13/2013 10:08:47 PM (12 years ago)

Author:

nacin

Message:

Merge the new dashboard design into core.

Merges ​https://github.com/growthdesigner/wp-dash.

props lessbloat, joen, helen, dbernar1, kraftbj, ryelle, tillkruess, grapplerulrich, markjaquith.
see #25824.

File:

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

trunk/src/wp-admin/post.php

@@ -67 +67 @@
         $location = explode('#', $location);
         $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' ) );
@@ -97 +95 @@
 
 switch($action) {
+case 'post-quickdraft-save':
+    // Check nonce and capabilities
+    $nonce = $_REQUEST['_wpnonce'];
+    $error_msg = false;
+    if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
+        $error_msg = 'Unable to submit this form, please refresh and try again.';
+
+    if ( ! current_user_can( 'edit_posts' ) )
+        $error_msg = "Oops, you don't have access to add new drafts.";
+
+    if ( $error_msg )
+        return wp_dashboard_quick_draft( $error_msg );
+
+    $post = get_post( $_REQUEST['post_ID'] );
+    check_admin_referer( 'add-' . $post->post_type );
+    edit_post();
+    // output the quickdraft dashboard widget
+    require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+    wp_dashboard_quick_draft();
+    exit;
+    break;
+
 case 'postajaxpost':
 case 'post':
-case 'post-quickpress-publish':
-case 'post-quickpress-save':
-    check_admin_referer('add-' . $post_type);
-
-    if ( 'post-quickpress-publish' == $action )
-        $_POST['publish'] = 'publish'; // tell write_post() to publish
-
-    if ( 'post-quickpress-publish' == $action || 'post-quickpress-save' == $action ) {
-        $_POST['comment_status'] = get_option('default_comment_status');
-        $_POST['ping_status'] = get_option('default_ping_status');
-        $post_id = edit_post();
-    } else {
-        $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
-    }
-
-    if ( 0 === strpos( $action, 'post-quickpress' ) ) {
-        $_POST['post_ID'] = $post_id;
-        // output the quickpress dashboard widget
-        require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
-        wp_dashboard_quick_press();
-        exit;
-    }
+    // Check nonce and capabilities
+    $nonce = $_REQUEST['_wpnonce'];
+    $error_msg = false;
+    if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
+        $error_msg = 'Unable to submit this form, please refresh and try again.';
+
+    if ( ! current_user_can( 'edit_posts' ) )
+        $error_msg = "Oops, you don't have access to add new drafts.";
+
+    $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
 
     redirect_post($post_id);