<!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>[14588] trunk: More typos.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14588">14588</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-12 21:03:33 +0000 (Wed, 12 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>More typos. see <a href="http://trac.wordpress.org/ticket/13358">#13358</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (14587 => 14588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php        2010-05-12 20:57:47 UTC (rev 14587)
+++ trunk/wp-admin/edit.php        2010-05-12 21:03:33 UTC (rev 14588)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> wp_enqueue_script('inline-edit-post');
</span><span class="cx"> 
</span><span class="cx"> $user_posts = false;
</span><del>-if ( !current_user_can($post_type_object-&gt;cap-&gt;edit_other_posts) ) {
</del><ins>+if ( !current_user_can($post_type_object-&gt;cap-&gt;edit_others_posts) ) {
</ins><span class="cx">         $user_posts_count = $wpdb-&gt;get_var( $wpdb-&gt;prepare(&quot;SELECT COUNT(1) FROM $wpdb-&gt;posts WHERE post_type = '%s' AND post_status NOT IN ('trash', 'auto-draft') AND post_author = %d&quot;, $post_type, $current_user-&gt;ID) );
</span><span class="cx">         $user_posts = true;
</span><span class="cx">         if ( $user_posts_count &amp;&amp; empty($_GET['post_status']) &amp;&amp; empty($_GET['all_posts']) &amp;&amp; empty($_GET['author']) )
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> &lt;input type=&quot;submit&quot; id=&quot;post-query-submit&quot; value=&quot;&lt;?php esc_attr_e('Filter'); ?&gt;&quot; class=&quot;button-secondary&quot; /&gt;
</span><span class="cx"> &lt;?php }
</span><span class="cx"> 
</span><del>-if ( $is_trash &amp;&amp; current_user_can($post_type_object-&gt;cap-&gt;edit_other_posts) ) { ?&gt;
</del><ins>+if ( $is_trash &amp;&amp; current_user_can($post_type_object-&gt;cap-&gt;edit_others_posts) ) { ?&gt;
</ins><span class="cx"> &lt;input type=&quot;submit&quot; name=&quot;delete_all&quot; id=&quot;delete_all&quot; value=&quot;&lt;?php esc_attr_e('Empty Trash'); ?&gt;&quot; class=&quot;button-secondary apply&quot; /&gt;
</span><span class="cx"> &lt;?php } ?&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> &lt;?php } ?&gt;
</span><span class="cx"> &lt;/select&gt;
</span><span class="cx"> &lt;input type=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Apply'); ?&gt;&quot; name=&quot;doaction2&quot; id=&quot;doaction2&quot; class=&quot;button-secondary action&quot; /&gt;
</span><del>-&lt;?php if ( $is_trash &amp;&amp; current_user_can($post_type_object-&gt;cap-&gt;edit_other_posts) ) { ?&gt;
</del><ins>+&lt;?php if ( $is_trash &amp;&amp; current_user_can($post_type_object-&gt;cap-&gt;edit_others_posts) ) { ?&gt;
</ins><span class="cx"> &lt;input type=&quot;submit&quot; name=&quot;delete_all2&quot; id=&quot;delete_all2&quot; value=&quot;&lt;?php esc_attr_e('Empty Trash'); ?&gt;&quot; class=&quot;button-secondary apply&quot; /&gt;
</span><span class="cx"> &lt;?php } ?&gt;
</span><span class="cx"> &lt;br class=&quot;clear&quot; /&gt;
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14587 => 14588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php        2010-05-12 20:57:47 UTC (rev 14587)
+++ trunk/wp-admin/includes/post.php        2010-05-12 21:03:33 UTC (rev 14588)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> 
</span><span class="cx">         $ptype = get_post_type_object( $post_data['post_type'] );
</span><span class="cx">         if ( isset($post_data['user_ID']) &amp;&amp; ($post_data['post_author'] != $post_data['user_ID']) ) {
</span><del>-                if ( !current_user_can( $ptype-&gt;cap-&gt;edit_other_posts ) ) {
</del><ins>+                if ( !current_user_can( $ptype-&gt;cap-&gt;edit_others_posts ) ) {
</ins><span class="cx">                         if ( 'page' == $post_data['post_type'] ) {
</span><span class="cx">                                 return new WP_Error( 'edit_others_pages', $update ?
</span><span class="cx">                                         __( 'You are not allowed to edit pages as this user.' ) :
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14587 => 14588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php        2010-05-12 20:57:47 UTC (rev 14587)
+++ trunk/wp-admin/includes/template.php        2010-05-12 21:03:33 UTC (rev 14588)
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx">                                 &lt;/select&gt;
</span><span class="cx">                         &lt;/label&gt;
</span><span class="cx"> 
</span><del>-&lt;?php if ( 'post' == $screen-&gt;post_type &amp;&amp; $can_publish &amp;&amp; current_user_can( $post_type_object-&gt;cap-&gt;edit_other_posts ) ) : ?&gt;
</del><ins>+&lt;?php if ( 'post' == $screen-&gt;post_type &amp;&amp; $can_publish &amp;&amp; current_user_can( $post_type_object-&gt;cap-&gt;edit_others_posts ) ) : ?&gt;
</ins><span class="cx"> 
</span><span class="cx"> &lt;?php        if ( $bulk ) : ?&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (14587 => 14588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php        2010-05-12 20:57:47 UTC (rev 14587)
+++ trunk/wp-admin/includes/user.php        2010-05-12 21:03:33 UTC (rev 14588)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         $user = new WP_User( $user_id );
</span><span class="cx">         $post_type_obj = get_post_type_object($post_type);
</span><span class="cx"> 
</span><del>-        if ( ! $user-&gt;has_cap($post_type_obj-&gt;cap-&gt;edit_other_posts) ) {
</del><ins>+        if ( ! $user-&gt;has_cap($post_type_obj-&gt;cap-&gt;edit_others_posts) ) {
</ins><span class="cx">                 if ( $user-&gt;has_cap($post_type_obj-&gt;cap-&gt;edit_posts) || ! $exclude_zeros )
</span><span class="cx">                         return array($user-&gt;id);
</span><span class="cx">                 else
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14587 => 14588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-05-12 20:57:47 UTC (rev 14587)
+++ trunk/wp-includes/query.php        2010-05-12 21:03:33 UTC (rev 14588)
</span><span class="lines">@@ -2194,7 +2194,7 @@
</span><span class="cx">                         $post_type_cap = $post_type_object-&gt;capability_type;
</span><span class="cx">                         $edit_cap = $post_type_object-&gt;cap-&gt;edit_post;
</span><span class="cx">                         $read_cap = $post_type_object-&gt;cap-&gt;read_post;
</span><del>-                        $edit_others_cap = $post_type_object-&gt;cap-&gt;edit_other_posts;
</del><ins>+                        $edit_others_cap = $post_type_object-&gt;cap-&gt;edit_others_posts;
</ins><span class="cx">                         $read_private_cap = $post_type_object-&gt;cap-&gt;read_private_posts;
</span><span class="cx">                 } else {
</span><span class="cx">                         $edit_cap = 'edit_' . $post_type_cap;
</span></span></pre>
</div>
</div>

</body>
</html>