Changeset 14815 for trunk/wp-admin/includes/dashboard.php

Timestamp:

05/23/2010 07:58:06 AM (16 years ago)

Author:

westi

Message:

Ensure that QuickPress media uploads get attached to the auto-draft we create for new posts correctly. Fixes #10917 props ocean90.

File:

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

trunk/wp-admin/includes/dashboard.php

@@ -384 +384 @@
 }
 
-function wp_dashboard_quick_press() {
+function wp_dashboard_quick_press_output() {
+        global $post_ID;
+
         $drafts = false;
         if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) && isset( $_POST['action'] ) && 0 === strpos( $_POST['action'], 'post-quickpress' ) && (int) $_POST['post_ID'] ) {
@@ -391 +393 @@
                 if ( 'post-quickpress-publish' == $_POST['action'] ) {
                         if ( current_user_can('publish_posts') )
-                                printf( '<div class="message"><p>' . __( 'Post Published. <a href="%s">View post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( $view ), $edit );
+                                printf( '<div class="updated"><p>' . __( 'Post published. <a href="%s">View post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( $view ), $edit );
                         else
-                                printf( '<div class="message"><p>' . __( 'Post submitted. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
+                                printf( '<div class="updated"><p>' . __( 'Post submitted. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
                 } else {
-                        printf( '<div class="message"><p>' . __( 'Draft Saved. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
+                        printf( '<div class="updated"><p>' . __( 'Draft saved. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
                         $drafts_query = new WP_Query( array(
                                 'post_type' => 'post',
@@ -408 +410 @@
                                 $drafts =& $drafts_query->posts;
                 }
-                printf('<p class="textright">' . __('You can also try %s, easy blogging from anywhere on the Web.') . '</p>', '<a href="tools.php">' . __('Press This') . '</a>' );
+                printf('<p class="textright">' . __('You can also try %s, easy blogging from anywhere on the Web.') . '</p>', '<a href="' . esc_url( admin_url( 'tools.php' ) ) . '">' . __('Press This') . '</a>' );
                 $_REQUEST = array(); // hack for get_default_post_to_edit()
         }
 
-        $post = get_default_post_to_edit();
+        /* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
+        $last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
+        if ( $last_post_id ) {
+                $post = get_post( $last_post_id );
+                if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
+                        $post = get_default_post_to_edit('post', true);
+                        update_user_option( (int) $GLOBALS['current_user']->ID, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+                } else {
+                        $post->post_title = ''; // Remove the auto draft title
+                }
+        } else {
+                $post = get_default_post_to_edit('post', true);
+                update_user_option( (int) $GLOBALS['current_user']->ID, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+        }
+
+        $post_ID = (int) $post->ID;
 ?>
 
@@ -441 +458 @@
                 <p class="submit">
                         <input type="hidden" name="action" id="quickpost-action" value="post-quickpress-save" />
-                        <input type="hidden" name="quickpress_post_ID" value="<?php echo (int) $post->ID; ?>" />
+                        <input type="hidden" name="quickpress_post_ID" value="<?php echo $post_ID; ?>" />
                         <input type="hidden" name="post_type" value="post" />
                         <?php wp_nonce_field('add-post'); ?>
@@ -458 +475 @@
         if ( $drafts )
                 wp_dashboard_recent_drafts( $drafts );
+}
+
+function wp_dashboard_quick_press() {
+        echo '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="describe hide-if-js">' . __('This widget requires JavaScript.') . '</p>';
 }