Ticket #10917: 10917-ajax+useroption.patch

wp-admin/includes/dashboard.php

@@ -383 +383 @@
         do_action( 'activity_box_end' );
 }
 
-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'] ) {
                 $view = get_permalink( $_POST['post_ID'] );
                 $edit = esc_url( get_edit_post_link( $_POST['post_ID'] ) );
                 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',
                                 'post_status' => 'draft',
@@ -407 +409 @@
                         if ( $drafts_query->posts )
                                 $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;
 ?>
 
         <form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press">
@@ -440 +457 @@
 
                 <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'); ?>
                         <input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php esc_attr_e('Save Draft'); ?>" />
@@ -459 +476 @@
                 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>';
+}
+
 function wp_dashboard_recent_drafts( $drafts = false ) {
         if ( !$drafts ) {
                 $drafts_query = new WP_Query( array(

wp-admin/index-extra.php

@@ -32 +32 @@
 case 'dashboard_plugins' :
         wp_dashboard_plugins_output();
         break;
+        
+case 'dashboard_quick_press' :
+        wp_dashboard_quick_press_output();
+        break;
 
 }
 

wp-admin/js/dashboard.dev.js

@@ -6 +6 @@
                 'dashboard_incoming_links',
                 'dashboard_primary',
                 'dashboard_secondary',
-                'dashboard_plugins'
+                'dashboard_plugins',
+                'dashboard_quick_press'
         ];
 
         ajaxPopulateWidgets = function(el) {
@@ -20 +21 @@
                                                         $(this).css('display', '');
                                                         if ( 'dashboard_plugins' == id && $.isFunction(tb_init) )
                                                                 tb_init('#dashboard_plugins a.thickbox');
+                                                        if ( 'dashboard_quick_press' == id && $.isFunction(tb_init) ) {
+                                                                tb_init('#dashboard_quick_press a.thickbox');
+                                                                quickPressLoad();
+                                                        }
                                                 });
                                         });
                                 }, i * 500 );
@@ -53 +58 @@
                         $('#dashboard_quick_press div.inside').load( t.attr( 'action' ), t.serializeArray(), function() {
                                 $('#dashboard_quick_press #publishing-action img.waiting').css('visibility', 'hidden');
                                 $('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr('disabled','');
+                                $('#dashboard_quick_press ul').next('p').remove();
                                 $('#dashboard_quick_press ul').find('li').each( function() {
                                         $('#dashboard_recent_drafts ul').prepend( this );
                                 } ).end().remove();
@@ -65 +71 @@
                 $('#publish').click( function() { act.val( 'post-quickpress-publish' ); } );
 
         };
-        quickPressLoad();
 
 } );

wp-admin/post.php

@@ -131 +131 @@
                 $_POST['post_ID'] = $post_id;
                 // output the quickpress dashboard widget
                 require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
-                wp_dashboard_quick_press();
+                wp_dashboard_quick_press_output();
                 exit;
         }