Ticket #23697: 23697-7.patch

wp-admin/css/wp-admin.css

@@ -3391 +3391 @@
         border-style: solid;
 }
 
-#notification-dialog {
+.notification-dialog {
         position: fixed;
         top: 30%;
         left: 50%;
@@ -3402 +3402 @@
         z-index: 1000005;
 }
 
-#notification-dialog-background {
+.notification-dialog-background {
         position: fixed;
         top: 0;
         left: 0;
@@ -3414 +3414 @@
         z-index: 1000000;
 }
 
-#notification-dialog .post-locked-message,
-#notification-dialog .post-taken-over {
+#post-lock-dialog .post-locked-message,
+#post-lock-dialog .post-taken-over {
         margin: 25px;
 }
 
-#notification-dialog .post-locked-message a.button {
+#post-lock-dialog .post-locked-message a.button {
         margin-right: 10px;
 }
 
-#notification-dialog .post-locked-avatar {
+#post-lock-dialog .post-locked-avatar {
         float: left;
         margin: 0 20px 20px 0;
 }
 
-#notification-dialog .wp-tab-first {
+#post-lock-dialog .wp-tab-first {
         outline: 0;
 }
 
-#notification-dialog .locked-saving img {
+#post-lock-dialog .locked-saving img {
         float: left;
         margin-right: 3px;
 }
 
-#notification-dialog-wrap.saving .locked-saving,
-#notification-dialog-wrap.saved .locked-saved {
+#post-lock-dialog.saving .locked-saving,
+#post-lock-dialog.saved .locked-saved {
         display: inline;
 }
 

wp-admin/includes/post.php

@@ -1202 +1202 @@
                 $locked = false;
         }
 
-        $class = $locked ? '' : ' class="hidden"';
+        $hidden = $locked ? '' : ' hidden';
 
         ?>
-        <div id="notification-dialog-wrap"<?php echo $class; ?>>
-        <div id="notification-dialog-background"></div>
-        <div id="notification-dialog">
+        <div id="post-lock-dialog" class="notification-dialog-wrap<?php echo $hidden; ?>">
+        <div class="notification-dialog-background"></div>
+        <div class="notification-dialog">
         <?php
 
         if ( $locked ) {

wp-admin/js/post.js

@@ -256 +256 @@
                 post_id = $('#post_ID').val(),
                 send = {};
 
-        if ( !post_id )
+        if ( ! post_id || ! $('#post-lock-dialog').length )
                 return;
 
         send['post_id'] = post_id;
@@ -276 +276 @@
 
                 if ( received.lock_error ) {
                         // show "editing taken over" message
-                        wrap = $('#notification-dialog-wrap');
+                        wrap = $('#post-lock-dialog');
 
                         if ( wrap.length && ! wrap.is(':visible') ) {
                                 if ( typeof autosave == 'function' ) {
@@ -305 +305 @@
                 } else if ( received.new_lock ) {
                         $('#active_post_lock').val( received.new_lock );
                 }
-
-                if ( received.update_nonces ) {
-                        $.each( received.update_nonces, function( selector, value ) {
-                                if ( selector.match(/^replace-/) )
-                                        $( '#' + selector.replace('replace-', '') ).val( value );
-                        });
-                }
         }
 });
 
@@ -359 +352 @@
         postboxes.add_postbox_toggles(pagenow);
 
         // Post locks: contain focus inside the dialog. If the dialog is shown, focus the first item.
-        $('#notification-dialog').on( 'keydown', function(e) {
+        $('#post-lock-dialog .notification-dialog').on( 'keydown', function(e) {
                 if ( e.which != 9 )
                         return;
 

wp-admin/post.php

@@ -176 +176 @@
                         wp_enqueue_script('autosave');
         }
 
-        add_action( 'admin_footer', '_admin_notice_post_locked' );
+        if ( is_multisite() ) {
+                add_action( 'admin_footer', '_admin_notice_post_locked' );
+        } else {
+                $blog_users = get_users( array( 'fields' => 'ID' ) );
 
+                if ( count( $blog_users ) > 1 )
+                        add_action( 'admin_footer', '_admin_notice_post_locked' );
+
+                unset( $blog_users );
+        }
+
         $title = $post_type_object->labels->edit_item;
         $post = get_post($post_id, OBJECT, 'edit');