Changeset 24408

Timestamp:

06/05/2013 03:01:59 AM (11 years ago)

Author:

azaozz

Message:

Post locks:

• When a post is locked, ensure the 'Go back' button doesn't reload the same screen. If no referrer, change the button from 'Go back' to 'Go to All Posts'/'Go to All Pages' etc.
• Remove restriction on checking locks only for posts.

See #23697.

Location:

trunk/wp-admin/includes

Files:

• misc.php (modified) (3 diffs)
• post.php (modified) (3 diffs)

trunk/wp-admin/includes/misc.php

@@ -570 +570 @@
     $checked = array();
 
-    if ( 'edit-post' == $screen_id && array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
+    if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
         foreach ( $data['wp-check-locked-posts'] as $key ) {
-            $post_id = (int) substr( $key, 5 );
-
-            if ( current_user_can( 'edit_post', $post_id ) && ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
+            if ( ! $post_id = absint( substr( $key, 5 ) ) )
+                continue;
+
+            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 ) );
 
@@ -598 +599 @@
  */
 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();
@@ -637 +638 @@
  */
 function wp_refresh_post_nonces( $response, $data, $screen_id ) {
-    if ( 'post' == $screen_id && array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
+    if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
         $received = $data['wp-refresh-post-nonces'];
 

trunk/wp-admin/includes/post.php

@@ -1203 +1203 @@
     }
 
+    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';
 
@@ -1230 +1245 @@
         <?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
@@ -1255 +1270 @@
             </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