<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11923] trunk/wp-admin:
Switch the post|page being editing message from a create_function call to a normal function and reduce the duplicated code
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11923">11923</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-09-13 08:52:39 +0000 (Sun, 13 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch the post|page being editing message from a create_function call to a normal function and reduce the duplicated code. See <a href="http://trac.wordpress.org/ticket/10729">#10729</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminpagephp">trunk/wp-admin/page.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/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 (11922 => 11923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2009-09-13 08:34:24 UTC (rev 11922)
+++ trunk/wp-admin/includes/post.php 2009-09-13 08:52:39 UTC (rev 11923)
</span><span class="lines">@@ -1073,6 +1073,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Outputs the notice message to say that someone else is editing this post at the moment.
+ *
+ * @since 2.9.0
+ * @return none
+ */
+function _admin_notice_post_locked() {
+ global $post;
+ $last_user = get_userdata( get_post_meta( $post->ID, '_edit_last', true ) );
+ $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
+ $post_type_name = ('page' == $post->post_type) ? _x('page', 'Used to describe page in admin_notice when other user editing.') : _x('post','Used to describe post in admin_notice when other user editing.');
+ $message = sprintf( __( 'Warning: %1$s is currently editing this %2$s' ), esc_html( $last_user_name ), esc_html( $post_type_name ) );
+ echo "<div class='error'><p>$message</p></div>";
+}
+
+/**
</ins><span class="cx"> * Creates autosave data for the specified post from $_POST data.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span></span></pre></div>
<a id="trunkwpadminpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/page.php (11922 => 11923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/page.php 2009-09-13 08:34:24 UTC (rev 11922)
+++ trunk/wp-admin/page.php 2009-09-13 08:52:39 UTC (rev 11923)
</span><span class="lines">@@ -108,11 +108,7 @@
</span><span class="cx"> wp_enqueue_script('word-count');
</span><span class="cx">
</span><span class="cx"> if ( $last = wp_check_post_lock( $post->ID ) ) {
</span><del>- $last_user = get_userdata( $last );
- $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
- $message = sprintf( __( 'Warning: %s is currently editing this page' ), esc_html( $last_user_name ) );
- $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
- add_action('admin_notices', create_function( '', "echo '$message';" ) );
</del><ins>+ add_action('admin_notices', '_admin_notice_post_locked' );
</ins><span class="cx"> } else {
</span><span class="cx"> wp_set_post_lock( $post->ID );
</span><span class="cx"> wp_enqueue_script('autosave');
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (11922 => 11923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2009-09-13 08:34:24 UTC (rev 11922)
+++ trunk/wp-admin/post.php 2009-09-13 08:52:39 UTC (rev 11923)
</span><span class="lines">@@ -143,11 +143,7 @@
</span><span class="cx"> enqueue_comment_hotkeys_js();
</span><span class="cx">
</span><span class="cx"> if ( $last = wp_check_post_lock( $post->ID ) ) {
</span><del>- $last_user = get_userdata( $last );
- $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
- $message = sprintf( __( 'Warning: %s is currently editing this post' ), esc_html( $last_user_name ) );
- $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
- add_action('admin_notices', create_function( '', "echo '$message';" ) );
</del><ins>+ add_action('admin_notices', '_admin_notice_post_locked' );
</ins><span class="cx"> } else {
</span><span class="cx"> wp_set_post_lock( $post->ID );
</span><span class="cx"> wp_enqueue_script('autosave');
</span></span></pre>
</div>
</div>
</body>
</html>