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

Timestamp:

08/20/2008 09:42:31 PM (17 years ago)

Author:

ryan

Message:

Collapse crazyhorse to trunk. Incoming! see #7552

File:

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

trunk/wp-admin/post.php

@@ -36 +36 @@
     } elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
         $location = 'sidebar.php?a=b';
-    } elseif ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
+    } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
         if ( $_POST['_wp_original_http_referer'] && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post-new.php') === false )
             $location = add_query_arg( array(
@@ -43 +43 @@
             ), get_edit_post_link( $post_ID, 'url' ) );
         else
-            $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) );
+            $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
     } elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
         $location = add_query_arg( 'message', 2, wp_get_referer() );
@@ -63 +63 @@
     } elseif ($action == 'editattachment') {
         $location = 'attachments.php';
+    } 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' ) );
@@ -76 +78 @@
 case 'postajaxpost':
 case 'post':
+case 'post-quickpress-publish':
+case 'post-quickpress-save':
+case 'post-quickpress-save-cont':
     check_admin_referer('add-post');
 
-    $post_ID = 'post' == $action ? write_post() : edit_post();
+    if ( 'post-quickpress-publish' == $action )
+        $_POST['publish'] = 'publish'; // tell write_post() to publish
+
+    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();
+    }
+
+    if ( 'post-quickpress-save-cont' != $action && 0 === strpos( $action, 'post-quickpress' ) ) {
+        $_POST['post_ID'] = $post_ID;
+        // output the quickpress dashboard widget
+        require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+        add_filter( 'wp_dashboard_widgets', create_function( '$a', 'return array( "dashboard_quick_press" );' ) );
+        wp_dashboard_setup();
+        wp_dashboard();
+        exit;
+    }
 
     redirect_post($post_ID);