Changeset 24042 for trunk/wp-admin/includes/post.php

Timestamp:

04/22/2013 03:08:51 AM (11 years ago)

Author:

azaozz

Message:

Post locks:

• Show 'Saving revision...' while autosaving after a post has been taken over. Change to 'Your latest changes were saved as a revision.' when autosave completes.
• Make sure a user exists before using $user->display_name.
• Add 'post_lock_text' action for extending the message text.

File:

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

trunk/wp-admin/includes/post.php

@@ -1198 +1198 @@
         return;
 
-    if ( $user = wp_check_post_lock( $post->ID ) ) {
-        $user = get_userdata( $user );
+    if ( ( $user_id = wp_check_post_lock( $post->ID ) ) && ( $user = get_userdata( $user_id ) ) ) {
         $locked = apply_filters( 'show_post_locked_dialog', true, $post, $user );
     } else {
@@ -1230 +1229 @@
         <div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
         <p class="currently-editing wp-tab-first" tabindex="0"><?php esc_html_e( sprintf( __( 'This content is currently locked. If you take over, %s will be blocked from continuing to edit.' ), $user->display_name ) ); ?></p>
+        <?php do_action( 'post_lock_text', $post ); ?>
         <p>
         <a class="button" href="<?php echo esc_url( wp_get_referer() ); ?>"><?php _e('Go back'); ?></a>
@@ -1250 +1250 @@
         <div class="post-taken-over">
             <div class="post-locked-avatar"></div>
-            <p class="currently-editing wp-tab-first" tabindex="0"></p>
+            <p class="wp-tab-first" tabindex="0">
+            <span class="currently-editing"></span><br>
+            <span class="locked-saving hidden"><img src="images/wpspin_light-2x.gif" width="16" height="16" /> <?php _e('Saving revision...'); ?></span>
+            <span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
+            </p>
+            <?php do_action( 'post_lock_text', $post ); ?>
             <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( admin_url('edit.php') ); ?>"><?php _e('Go to All Posts'); ?></a></p>
         </div>