Changeset 24883

Timestamp:

07/29/2013 07:25:26 PM (11 years ago)

Author:

aaroncampbell

Message:

Make the show_post_locked_dialog filter hide both the post locked and post taken over dialogs

props azaozz, DH-Shredder. Fixes #24830 for trunk.

File:

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

trunk/wp-admin/includes/post.php

@@ -1208 +1208 @@
         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;
@@ -1284 +1291 @@
             <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( '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>