<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16901] trunk/wp-admin/includes/post.php: Add user id to lock.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16901">16901</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-13 21:23:46 +0000 (Mon, 13 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add user id to lock. Props duck_. see <a href="http://trac.wordpress.org/ticket/15130">#15130</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (16900 => 16901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-12-13 21:21:50 UTC (rev 16900)
+++ trunk/wp-admin/includes/post.php 2010-12-13 21:23:46 UTC (rev 16901)
</span><span class="lines">@@ -1201,13 +1201,17 @@
</span><span class="cx"> if ( !$post = get_post( $post_id ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $lock = get_post_meta( $post->ID, '_edit_lock', true );
- $last = get_post_meta( $post->ID, '_edit_last', true );
</del><ins>+ if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
+ return false;
</ins><span class="cx">
</span><ins>+ $lock = explode( ':', $lock );
+ $time = $lock[0];
+ $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+
</ins><span class="cx"> $time_window = apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 );
</span><span class="cx">
</span><del>- if ( $lock && $lock > time() - $time_window && $last != get_current_user_id() )
- return $last;
</del><ins>+ if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
+ return $user;
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1222,12 +1226,13 @@
</span><span class="cx"> function wp_set_post_lock( $post_id ) {
</span><span class="cx"> if ( !$post = get_post( $post_id ) )
</span><span class="cx"> return false;
</span><del>- if ( 0 == get_current_user_id() )
</del><ins>+ if ( 0 == ($user_id = get_current_user_id()) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $now = time();
</span><ins>+ $lock = "$now:$user_id";
</ins><span class="cx">
</span><del>- update_post_meta( $post->ID, '_edit_lock', $now );
</del><ins>+ update_post_meta( $post->ID, '_edit_lock', $lock );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1238,7 +1243,10 @@
</span><span class="cx"> */
</span><span class="cx"> function _admin_notice_post_locked() {
</span><span class="cx"> global $post;
</span><del>- $last_user = get_userdata( get_post_meta( $post->ID, '_edit_last', true ) );
</del><ins>+
+ $lock = explode( ':', get_post_meta( $post->ID, '_edit_lock', true ) );
+ $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+ $last_user = get_userdata( $user );
</ins><span class="cx"> $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
</span><span class="cx">
</span><span class="cx"> switch ($post->post_type) {
</span></span></pre>
</div>
</div>
</body>
</html>