Ticket #23697: 23697-8.patch

wp-admin/includes/misc.php

@@ -569 +569 @@
 function wp_check_locked_posts( $response, $data, $screen_id ) {
         $checked = array();
 
-        if ( 'edit-post' == $screen_id && array_key_exists( 'wp-check-locked', $data ) && is_array( $data['wp-check-locked'] ) ) {
-                foreach ( $data['wp-check-locked'] as $key ) {
-                        $post_id = (int) substr( $key, 5 );
+        if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
+                foreach ( $data['wp-check-locked-posts'] as $key ) {
+                        if ( ! $post_id = absint( substr( $key, 5 ) ) )
+                                continue;
 
-                        if ( current_user_can( 'edit_post', $post_id ) && ( $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 ) ) && current_user_can( 'edit_post', $post_id ) ) {
                                 $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
 
                                 if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
@@ -585 +586 @@
         }
 
         if ( ! empty( $checked ) )
-                $response['wp-check-locked'] = $checked;
+                $response['wp-check-locked-posts'] = $checked;
 
         return $response;
 }
@@ -597 +598 @@
  * @since 3.6
  */
 function wp_refresh_post_lock( $response, $data, $screen_id ) {
-        if ( 'post' == $screen_id && array_key_exists( 'wp-refresh-post-lock', $data ) ) {
+        if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
                 $received = $data['wp-refresh-post-lock'];
                 $send = array();
 
-                if ( !$post_id = absint( $received['post_id'] ) )
+                if ( ! $post_id = absint( $received['post_id'] ) )
                         return $response;
 
-                if ( !current_user_can('edit_post', $post_id) )
+                if ( ! current_user_can('edit_post', $post_id) )
                         return $response;
 
                 if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {

wp-admin/includes/post.php

@@ -1202 +1202 @@
                 $locked = false;
         }
 
+        if ( $locked && ( $sendback = wp_get_referer() ) && 
+                false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
+
+                $sendback_text = __('Go back');
+        } else {
+                $sendback = admin_url( 'edit.php' );
+
+                if ( 'post' != $post->post_type && ( $post_type_object = get_post_type_object( $post->post_type ) ) ) {
+                        $sendback .= '?post_type=' . $post->post_type;
+                        $sendback_text = sprintf( _x('Go to All %s', 'post type general name: Posts, Pages, etc.'), $post_type_object->labels->name );
+                } else {
+                        $sendback_text = __('Go to All Posts');
+                }
+        }
+
         $hidden = $locked ? '' : ' hidden';
 
         ?>
@@ -1229 +1244 @@
                 <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>
+                <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>
                 <?php
 
@@ -1254 +1269 @@
                         <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>
+                        <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
                 </div>
                 <?php
         }

wp-admin/js/inline-edit-post.js

@@ -293 +293 @@
 $( document ).ready( function(){ inlineEditPost.init(); } );
 
 // Show/hide locks on posts
-$( document ).on( 'heartbeat-tick.wp-check-locked', function( e, data ) {
-        var locked = data['wp-check-locked'] || {};
+$( document ).on( 'heartbeat-tick.wp-check-locked-posts', function( e, data ) {
+        var locked = data['wp-check-locked-posts'] || {};
 
         $('#the-list tr').each( function(i, el) {
                 var key = el.id, row = $(el), lock_data, avatar;
@@ -315 +315 @@
                         row.find('.column-title .locked-avatar').empty();
                 }
         });
-}).on( 'heartbeat-send.wp-check-locked', function( e, data ) {
+}).on( 'heartbeat-send.wp-check-locked-posts', function( e, data ) {
         var check = [];
 
         $('#the-list tr').each( function(i, el) {
@@ -324 +324 @@
         });
 
         if ( check.length )
-                data['wp-check-locked'] = check;
+                data['wp-check-locked-posts'] = check;
 });
 
 }(jQuery));