Ticket #24830: 24830.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 );
-        } else {
-                $locked = false;
-        }
+        $locked = false;
+        if ( ( $user_id = wp_check_post_lock( $post->ID ) ) && ( $user = get_userdata( $user_id ) ) )
+                $locked = true;
 
         if ( $locked && ( $sendback = wp_get_referer() ) && 
                 false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
@@ -1251 +1249 @@
                 <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 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 ); ?>
+                <?php do_action( 'post_locked_text', $post ); ?>
                 <p>
                 <a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
                 <a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e('Preview'); ?></a>
@@ -1277 +1275 @@
                         <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( 'post_lock_taken_over_text', $post ); ?>
                         <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
                 </div>
                 <?php