<!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>[24408] trunk/wp-admin/includes: 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/24408">24408</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-06-05 03:01:59 +0000 (Wed, 05 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/23697">#23697</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (24407 => 24408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2013-06-05 00:59:01 UTC (rev 24407)
+++ trunk/wp-admin/includes/misc.php 2013-06-05 03:01:59 UTC (rev 24408)
</span><span class="lines">@@ -569,11 +569,12 @@
</span><span class="cx"> function wp_check_locked_posts( $response, $data, $screen_id ) {
</span><span class="cx"> $checked = array();
</span><span class="cx">
</span><del>- if ( 'edit-post' == $screen_id && array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
</del><ins>+ if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
</ins><span class="cx"> foreach ( $data['wp-check-locked-posts'] as $key ) {
</span><del>- $post_id = (int) substr( $key, 5 );
</del><ins>+ if ( ! $post_id = absint( substr( $key, 5 ) ) )
+ continue;
</ins><span class="cx">
</span><del>- if ( current_user_can( 'edit_post', $post_id ) && ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
</del><ins>+ if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
</ins><span class="cx"> $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
</span><span class="cx">
</span><span class="cx"> if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
</span><span class="lines">@@ -597,7 +598,7 @@
</span><span class="cx"> * @since 3.6
</span><span class="cx"> */
</span><span class="cx"> function wp_refresh_post_lock( $response, $data, $screen_id ) {
</span><del>- if ( 'post' == $screen_id && array_key_exists( 'wp-refresh-post-lock', $data ) ) {
</del><ins>+ if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
</ins><span class="cx"> $received = $data['wp-refresh-post-lock'];
</span><span class="cx"> $send = array();
</span><span class="cx">
</span><span class="lines">@@ -636,7 +637,7 @@
</span><span class="cx"> * @since 3.6
</span><span class="cx"> */
</span><span class="cx"> function wp_refresh_post_nonces( $response, $data, $screen_id ) {
</span><del>- if ( 'post' == $screen_id && array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
</del><ins>+ if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
</ins><span class="cx"> $received = $data['wp-refresh-post-nonces'];
</span><span class="cx">
</span><span class="cx"> if ( ! $post_id = absint( $received['post_id'] ) )
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (24407 => 24408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2013-06-05 00:59:01 UTC (rev 24407)
+++ trunk/wp-admin/includes/post.php 2013-06-05 03:01:59 UTC (rev 24408)
</span><span class="lines">@@ -1202,6 +1202,21 @@
</span><span class="cx"> $locked = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( $locked && ( $sendback = wp_get_referer() ) &&
+ false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
+
+ $sendback_text = __('Go back');
+ } else {
+ $sendback = admin_url( 'edit.php' );
+
+ if ( 'post' != $post->post_type && ( $post_type_object = get_post_type_object( $post->post_type ) ) ) {
+ $sendback .= '?post_type=' . $post->post_type;
+ $sendback_text = sprintf( _x('Go to All %s', 'post type general name: Posts, Pages, etc.'), $post_type_object->labels->name );
+ } else {
+ $sendback_text = __('Go to All Posts');
+ }
+ }
+
</ins><span class="cx"> $hidden = $locked ? '' : ' hidden';
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="lines">@@ -1229,7 +1244,7 @@
</span><span class="cx"> <p class="currently-editing wp-tab-first" tabindex="0"><?php esc_html_e( sprintf( __( 'This content is currently locked. If you take over, %s will be blocked from continuing to edit.' ), $user->display_name ) ); ?></p>
</span><span class="cx"> <?php do_action( 'post_lock_text', $post ); ?>
</span><span class="cx"> <p>
</span><del>- <a class="button" href="<?php echo esc_url( wp_get_referer() ); ?>"><?php _e('Go back'); ?></a>
</del><ins>+ <a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
</ins><span class="cx"> <a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e('Preview'); ?></a>
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="lines">@@ -1254,7 +1269,7 @@
</span><span class="cx"> <span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
</span><span class="cx"> </p>
</span><span class="cx"> <?php do_action( 'post_lock_text', $post ); ?>
</span><del>- <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( admin_url('edit.php') ); ?>"><?php _e('Go to All Posts'); ?></a></p>
</del><ins>+ <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>