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

Timestamp:

04/22/2013 03:08:51 AM (13 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/misc.php (modified) (2 diffs)

trunk/wp-admin/includes/misc.php

@@ -575 +575 @@
 
             if ( current_user_can( 'edit_post', $post_id ) && ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
-                $send = array();
+                $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
 
                 if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
                     $send['avatar_src'] = $matches[1];
 
-                $send['text'] = sprintf( __( '%s is currently editing' ), $user->display_name );
                 $checked[$key] = $send;
             }
@@ -609 +608 @@
             return $response;
 
-        if ( $user_id = wp_check_post_lock( $post_id ) ) {
-            $user = get_userdata( $user_id );
-
+        if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
             $error = array(
                 'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )