<!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>[33096] trunk: Check for all required caps before (un)sticking a post.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33096">33096</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33096","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-06 22:40:59 +0000 (Mon, 06 Jul 2015)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Check for all required caps before (un)sticking a post.

In cases where a user has the `edit_others_posts` capability but not
`publish_posts`, it was possible for that user to unstick a post after editing,
since the input field was never made available in that context.

Props ericmann, chriscct7.
Fixes <a href="https://core.trac.wordpress.org/ticket/24153">#24153</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php      2015-07-06 20:36:18 UTC (rev 33095)
+++ trunk/src/wp-admin/includes/post.php        2015-07-06 22:40:59 UTC (rev 33096)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        wp_set_post_lock( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( current_user_can( $ptype->cap->edit_others_posts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $post_data['sticky'] ) )
</span><span class="cx" style="display: block; padding: 0 10px">                        stick_post( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px">                else
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php        2015-07-06 20:36:18 UTC (rev 33095)
+++ trunk/tests/phpunit/tests/post.php  2015-07-06 22:40:59 UTC (rev 33096)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1023,4 +1023,103 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'closed', $post->ping_status );
</span><span class="cx" style="display: block; padding: 0 10px">                _unregister_post_type( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       /**
+        * If a post is sticky and is updated by a user that does not have the publish_post capability, it should _stay_
+        * sticky.
+        *
+        * @ticket 24153
+        */
+       function test_user_without_publish_cannot_affect_sticky() {
+               // Create a role with edit_others_posts.
+               add_role( 'grammarian', 'Grammarian', array(
+                       'read'                 => true,
+                       'edit_posts'           => true,
+                       'edit_others_posts'    => true,
+                       'edit_published_posts' => true,
+               ) );
+               $editor_user = $this->factory->user->create( array( 'role' => 'grammarian' ) );
+               $old_uid = get_current_user_id();
+               wp_set_current_user( $editor_user );
+
+               // Sanity Check.
+               $this->assertFalse( current_user_can( 'publish_posts' ) );
+               $this->assertTrue( current_user_can( 'edit_others_posts' ) );
+               $this->assertTrue( current_user_can( 'edit_published_posts' ) );
+
+               // Create a sticky post.
+               $post = $this->factory->post->create_and_get( array(
+                       'post_title'   => 'Will be changed',
+                       'post_content' => 'Will be changed',
+               ) );
+               stick_post( $post->ID );
+
+               // Sanity Check.
+               $this->assertTrue( is_sticky( $post->ID ) );
+
+               // Edit the post.
+               $post->post_title = 'Updated';
+               $post->post_content = 'Updated';
+               wp_update_post( $post );
+
+               // Make sure it's still sticky.
+               $saved_post = get_post( $post->ID );
+               $this->assertTrue( is_sticky( $saved_post->ID ) );
+               $this->assertEquals( 'Updated', $saved_post->post_title );
+               $this->assertEquals( 'Updated', $saved_post->post_content );
+
+               // Teardown
+               wp_set_current_user( $old_uid );
+       }
+
+       /**
+        * If the `edit_post()` method is invoked by a user without publish_posts permission, the sticky status of the post
+        * should not be changed.
+        *
+        * @ticket 24153
+        */
+       function test_user_without_publish_cannot_affect_sticky_with_edit_post() {
+               // Create a sticky post.
+               $post = $this->factory->post->create_and_get( array(
+                       'post_title'   => 'Will be changed',
+                       'post_content' => 'Will be changed',
+               ) );
+               stick_post( $post->ID );
+
+               // Sanity Check.
+               $this->assertTrue( is_sticky( $post->ID ) );
+
+               // Create a role with edit_others_posts.
+               add_role( 'grammarian', 'Grammarian', array(
+                       'read'                 => true,
+                       'edit_posts'           => true,
+                       'edit_others_posts'    => true,
+                       'edit_published_posts' => true,
+               ) );
+               $editor_user = $this->factory->user->create( array( 'role' => 'grammarian' ) );
+               $old_uid = get_current_user_id();
+               wp_set_current_user( $editor_user );
+
+               // Sanity Check.
+               $this->assertFalse( current_user_can( 'publish_posts' ) );
+               $this->assertTrue( current_user_can( 'edit_others_posts' ) );
+               $this->assertTrue( current_user_can( 'edit_published_posts' ) );
+
+               // Edit the post - The key 'sticky' is intentionally unset.
+               $data = array(
+                       'post_ID'      => $post->ID,
+                       'post_title'   => 'Updated',
+                       'post_content' => 'Updated',
+               );
+               edit_post( $data );
+
+               // Make sure it's still sticky
+               $saved_post = get_post( $post->ID );
+               $this->assertTrue( is_sticky( $saved_post->ID ) );
+               $this->assertEquals( 'Updated', $saved_post->post_title );
+               $this->assertEquals( 'Updated', $saved_post->post_content );
+
+               // Teardown
+               wp_set_current_user( $old_uid );
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>