Ticket #23697: 23697-3.patch

wp-admin/includes/class-wp-posts-list-table.php

@@ -477 +477 @@
                 $classes = $alternate . ' iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
 
                 $lock_holder = wp_check_post_lock( $post->ID );
+                // Don't show the "[superadmin] is currently editing" in the list table
+                // when a superadmin that is not a member of this blog has locked the post
+                if ( $lock_holder && is_multisite() && is_super_admin( $lock_holder ) && ! is_user_member_of_blog( $lock_holder ) )
+                        $lock_holder = false;
+                
                 if ( $lock_holder ) {
                         $classes .= ' wp-locked';
                         $lock_holder = get_userdata( $lock_holder );

wp-admin/includes/misc.php

@@ -608 +608 @@
                 if ( !current_user_can('edit_post', $post_id) )
                         return $response;
 
+                // No locks for superadmins that are not users on this blog
+                if ( is_multisite() && is_super_admin() && ! is_user_member_of_blog() )
+                        return $response;
+
                 if ( $user_id = wp_check_post_lock( $post_id ) ) {
+                        // Don't show the "[superadmin] has taken over..." dialog to users
+                        // when a superadmin that is not a member of this blog has locked the post
+                        if ( is_multisite() && is_super_admin( $user_id ) && ! is_user_member_of_blog( $user_id ) )
+                                return $response;
+
                         $user = get_userdata( $user_id );
 
                         $error = array(

wp-admin/includes/post.php

@@ -1190 +1190 @@
         if ( ! $post = get_post() )
                 return;
 
-        if ( $user = wp_check_post_lock( $post->ID ) ) {
-                $user = get_userdata( $user );
-                $locked = apply_filters( 'show_post_locked_dialog', true, $post, $user );
+        // Don't show "locked" dialogs to superadmins that are not users on this blog
+        if ( is_multisite() && is_super_admin() && ! is_user_member_of_blog() )
+                return;
+
+        if ( $user_id = wp_check_post_lock( $post->ID ) ) {
+                // Don't show the "Content locked..." dialog to users
+                // when a superadmin that is not a member of this blog has locked the post
+                if ( is_multisite() && is_super_admin( $user_id ) && ! is_user_member_of_blog( $user_id ) )
+                        $locked = false;
+                else
+                        $locked = true;
+
+                $user = get_userdata( $user_id );
+                $locked = apply_filters( 'show_post_locked_dialog', $locked, $post, $user );
         } else {
                 $locked = false;
         }

wp-admin/js/post.js

@@ -276 +276 @@
                         // show "editing taken over" message
                         wrap = $('#notification-dialog-wrap');
 
-                        if ( ! wrap.is(':visible') ) {
-                                autosave();
+                        if ( wrap.length && ! wrap.is(':visible') ) {
+                                if ( typeof autosave == 'function' )
+                                        autosave();
 
                                 if ( received.lock_error.avatar_src ) {
                                         avatar = $('<img class="avatar avatar-64 photo" width="64" height="64" />').attr( 'src', received.lock_error.avatar_src.replace(/&amp;/g, '&') );