<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24304] trunk/wp-admin: Post locks:</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24304">24304</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-05-20 19:36:29 +0000 (Mon, 20 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Post locks:
- Change from IDs to classes for the notification-dialog divs so they can be reused.
- Do not check post locks if the dialog's html is not present.
- Do not check post locks if there is only one user on a single site install.
See <a href="http://core.trac.wordpress.org/ticket/23697">#23697</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminjspostjs">trunk/wp-admin/js/post.js</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (24303 => 24304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css  2013-05-20 12:10:58 UTC (rev 24303)
+++ trunk/wp-admin/css/wp-admin.css     2013-05-20 19:36:29 UTC (rev 24304)
</span><span class="lines">@@ -3391,7 +3391,7 @@
</span><span class="cx">  border-style: solid;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog {
</del><ins>+.notification-dialog {
</ins><span class="cx">   position: fixed;
</span><span class="cx">  top: 30%;
</span><span class="cx">  left: 50%;
</span><span class="lines">@@ -3402,7 +3402,7 @@
</span><span class="cx">  z-index: 1000005;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog-background {
</del><ins>+.notification-dialog-background {
</ins><span class="cx">   position: fixed;
</span><span class="cx">  top: 0;
</span><span class="cx">  left: 0;
</span><span class="lines">@@ -3414,31 +3414,31 @@
</span><span class="cx">  z-index: 1000000;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog .post-locked-message,
-#notification-dialog .post-taken-over {
</del><ins>+#post-lock-dialog .post-locked-message,
+#post-lock-dialog .post-taken-over {
</ins><span class="cx">   margin: 25px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog .post-locked-message a.button {
</del><ins>+#post-lock-dialog .post-locked-message a.button {
</ins><span class="cx">   margin-right: 10px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog .post-locked-avatar {
</del><ins>+#post-lock-dialog .post-locked-avatar {
</ins><span class="cx">   float: left;
</span><span class="cx">  margin: 0 20px 20px 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog .wp-tab-first {
</del><ins>+#post-lock-dialog .wp-tab-first {
</ins><span class="cx">   outline: 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog .locked-saving img {
</del><ins>+#post-lock-dialog .locked-saving img {
</ins><span class="cx">   float: left;
</span><span class="cx">  margin-right: 3px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#notification-dialog-wrap.saving .locked-saving,
-#notification-dialog-wrap.saved .locked-saved {
</del><ins>+#post-lock-dialog.saving .locked-saving,
+#post-lock-dialog.saved .locked-saved {
</ins><span class="cx">   display: inline;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (24303 => 24304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2013-05-20 12:10:58 UTC (rev 24303)
+++ trunk/wp-admin/includes/post.php    2013-05-20 19:36:29 UTC (rev 24304)
</span><span class="lines">@@ -1202,12 +1202,12 @@
</span><span class="cx">          $locked = false;
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       $class = $locked ? '' : ' class="hidden"';
</del><ins>+        $hidden = $locked ? '' : ' hidden';
</ins><span class="cx"> 
</span><span class="cx">  ?>
</span><del>-       <div id="notification-dialog-wrap"<?php echo $class; ?>>
-       <div id="notification-dialog-background"></div>
-       <div id="notification-dialog">
</del><ins>+        <div id="post-lock-dialog" class="notification-dialog-wrap<?php echo $hidden; ?>">
+       <div class="notification-dialog-background"></div>
+       <div class="notification-dialog">
</ins><span class="cx">   <?php
</span><span class="cx"> 
</span><span class="cx">  if ( $locked ) {
</span></span></pre></div>
<a id="trunkwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post.js (24303 => 24304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post.js        2013-05-20 12:10:58 UTC (rev 24303)
+++ trunk/wp-admin/js/post.js   2013-05-20 19:36:29 UTC (rev 24304)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">          post_id = $('#post_ID').val(),
</span><span class="cx">          send = {};
</span><span class="cx"> 
</span><del>-       if ( !post_id )
</del><ins>+        if ( ! post_id || ! $('#post-lock-dialog').length )
</ins><span class="cx">           return;
</span><span class="cx"> 
</span><span class="cx">  send['post_id'] = post_id;
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> 
</span><span class="cx">          if ( received.lock_error ) {
</span><span class="cx">                  // show "editing taken over" message
</span><del>-                       wrap = $('#notification-dialog-wrap');
</del><ins>+                        wrap = $('#post-lock-dialog');
</ins><span class="cx"> 
</span><span class="cx">                  if ( wrap.length && ! wrap.is(':visible') ) {
</span><span class="cx">                          if ( typeof autosave == 'function' ) {
</span><span class="lines">@@ -305,13 +305,6 @@
</span><span class="cx">          } else if ( received.new_lock ) {
</span><span class="cx">                  $('#active_post_lock').val( received.new_lock );
</span><span class="cx">          }
</span><del>-
-               if ( received.update_nonces ) {
-                       $.each( received.update_nonces, function( selector, value ) {
-                               if ( selector.match(/^replace-/) )
-                                       $( '#' + selector.replace('replace-', '') ).val( value );
-                       });
-               }
</del><span class="cx">   }
</span><span class="cx"> });
</span><span class="cx"> 
</span><span class="lines">@@ -359,7 +352,7 @@
</span><span class="cx">  postboxes.add_postbox_toggles(pagenow);
</span><span class="cx"> 
</span><span class="cx">  // Post locks: contain focus inside the dialog. If the dialog is shown, focus the first item.
</span><del>-       $('#notification-dialog').on( 'keydown', function(e) {
</del><ins>+        $('#post-lock-dialog .notification-dialog').on( 'keydown', function(e) {
</ins><span class="cx">           if ( e.which != 9 )
</span><span class="cx">                  return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (24303 => 24304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php  2013-05-20 12:10:58 UTC (rev 24303)
+++ trunk/wp-admin/post.php     2013-05-20 19:36:29 UTC (rev 24304)
</span><span class="lines">@@ -176,8 +176,17 @@
</span><span class="cx">                  wp_enqueue_script('autosave');
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       add_action( 'admin_footer', '_admin_notice_post_locked' );
</del><ins>+        if ( is_multisite() ) {
+               add_action( 'admin_footer', '_admin_notice_post_locked' );
+       } else {
+               $check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
</ins><span class="cx"> 
</span><ins>+               if ( count( $check_users ) > 1 )
+                       add_action( 'admin_footer', '_admin_notice_post_locked' );
+
+               unset( $check_users );
+       }
+
</ins><span class="cx">   $title = $post_type_object->labels->edit_item;
</span><span class="cx">  $post = get_post($post_id, OBJECT, 'edit');
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>