Changeset 24408 for trunk/wp-admin/includes/misc.php

Timestamp:

06/05/2013 03:01:59 AM (12 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.

File:

• trunk/wp-admin/includes/misc.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'];