Ticket #24830: 24830-3.patch

wp-admin/includes/post.php

@@ -1207 +1207 @@
         if ( ! $post = get_post() )
                 return;
 
-        if ( ( $user_id = wp_check_post_lock( $post->ID ) ) && ( $user = get_userdata( $user_id ) ) ) {
-                $locked = apply_filters( 'show_post_locked_dialog', true, $post, $user );
+        $user = null;
+        if (  $user_id = wp_check_post_lock( $post->ID ) )
+                $user = get_userdata( $user_id );
+        
+        if ( $user ) {
+                if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
+                        return;
+
+                $locked = true;
         } else {
                 $locked = false;
         }
@@ -1255 +1262 @@
                 <div class="post-locked-message">
                 <div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
                 <p class="currently-editing wp-tab-first" tabindex="0"><?php echo esc_html( 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 ); ?>
+                <?php do_action( 'in_post_locked_dialog', $post ); ?>
                 <p>
                 <a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
                 <?php if ( $preview_link ) { ?>
@@ -1283 +1290 @@
                         <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 ); ?>
+                        <?php do_action( 'in_post_lock_taken_over_dialog', $post ); ?>
                         <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
                 </div>
                 <?php