<!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>[15033] branches/2.9/wp-admin/includes: Backport [15032] to the 2.9 branch</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15033">15033</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-05-28 16:02:58 +0000 (Fri, 28 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Backport <a href="http://trac.wordpress.org/changeset/15032">[15032]</a> to the 2.9 branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches29wpadminincludespostphp">branches/2.9/wp-admin/includes/post.php</a></li>
<li><a href="#branches29wpadminincludestemplatephp">branches/2.9/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches29wpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-admin/includes/post.php (15032 => 15033)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-admin/includes/post.php 2010-05-28 15:49:13 UTC (rev 15032)
+++ branches/2.9/wp-admin/includes/post.php 2010-05-28 16:02:58 UTC (rev 15033)
</span><span class="lines">@@ -283,7 +283,9 @@
</span><span class="cx"> $updated = $skipped = $locked = array();
</span><span class="cx"> foreach ( $post_IDs as $post_ID ) {
</span><span class="cx">
</span><del>- if ( isset($children) && in_array($post_ID, $children) ) {
</del><ins>+ $edit_cap = ( get_post_type( $post_ID ) == 'page' ) ? 'edit_page' : 'edit_post';
+
+ if ( ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( $edit_cap, $post_ID ) ) {
</ins><span class="cx"> $skipped[] = $post_ID;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches29wpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-admin/includes/template.php (15032 => 15033)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-admin/includes/template.php 2010-05-28 15:49:13 UTC (rev 15032)
+++ branches/2.9/wp-admin/includes/template.php 2010-05-28 16:02:58 UTC (rev 15033)
</span><span class="lines">@@ -1623,7 +1623,7 @@
</span><span class="cx">
</span><span class="cx"> case 'cb':
</span><span class="cx"> ?>
</span><del>- <th scope="row" class="check-column"><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /></th>
</del><ins>+ <th scope="row" class="check-column"><?php if ( current_user_can( 'edit_page', $page->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> case 'date':
</span></span></pre>
</div>
</div>
</body>
</html>