<!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>[50726] branches/5.6: Grouped merges for 5.6.3.</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 { white-space: pre-line; 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/50726">50726</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/50726","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-04-15 01:06:00 +0000 (Thu, 15 Apr 2021)</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'>Grouped merges for 5.6.3.

* REST API: Allow authors to read their own password protected posts.
* About page update.

Merges <a href="https://core.trac.wordpress.org/changeset/50717">[50717]</a> to the 5.6 branch.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches56srcwpadminaboutphp">branches/5.6/src/wp-admin/about.php</a></li>
<li><a href="#branches56srcwpincludesrestapiendpointsclasswprestpostscontrollerphp">branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#branches56testsphpunittestsrestapirestpostscontrollerphp">branches/5.6/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches56">branches/5.6/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.6 2021-04-15 01:05:12 UTC (rev 50725)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.6  2021-04-15 01:06:00 UTC (rev 50726)
</ins><a id="branches56"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49781-49784,49786,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49836,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49913,49917,49919-49922,49938,49951-49952,49979,50003,50006,50035,50037,50039,50041,50049,50051,50053,50055,50058,50126,50176,50185,50192,50232,50267-50268,50285,50298-50299,50355,50379,50387,50413,50416,50432,50435-50436,50441-50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50592,50598,50670,50714
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49781-49784,49786,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49836,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49913,49917,49919-49922,49938,49951-49952,49979,50003,50006,50035,50037,50039,50041,50049,50051,50053,50055,50058,50126,50176,50185,50192,50232,50267-50268,50285,50298-50299,50355,50379,50387,50413,50416,50432,50435-50436,50441-50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50592,50598,50670,50714,50717
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches56srcwpadminaboutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-admin/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-admin/about.php       2021-04-15 01:05:12 UTC (rev 50725)
+++ branches/5.6/src/wp-admin/about.php 2021-04-15 01:06:00 UTC (rev 50726)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,6 +77,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                <p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                        printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                /* translators: %s: WordPress version number */
+                                               __( '<strong>Version %s</strong> addressed some security issues.' ),
+                                               '5.6.3'
+                                       );
+                                       ?>
+                                       <?php
+                                       printf(
+                                               /* translators: %s: HelpHub URL */
+                                               __( 'For more information, see <a href="%s">the release notes</a>.' ),
+                                               sprintf(
+                                                       /* translators: %s: WordPress version */
+                                                       esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+                                                       sanitize_title( '5.6.3' )
+                                               )
+                                       );
+                                       ?>
+                               </p>
+                               <p>
+                                       <?php
+                                       printf(
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 /* translators: 1: WordPress version number, 2: Plural number of bugs. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                _n(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<strong>Version %1$s</strong> addressed %2$s bug.',
</span></span></pre></div>
<a id="branches56srcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php        2021-04-15 01:05:12 UTC (rev 50725)
+++ branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php  2021-04-15 01:06:00 UTC (rev 50726)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        protected $meta;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Passwordless post access permitted.
+        *
+        * @since 5.7.1
+        * @var int[]
+        */
+       protected $password_check_passed = array();
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,6 +157,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Override the result of the post password check for REST requested posts.
+        *
+        * Allow users to read the content of password protected posts if they have
+        * previously passed a permission check or if they have the `edit_post` capability
+        * for the post being checked.
+        *
+        * @since 5.7.1
+        *
+        * @param bool    $required Whether the post requires a password check.
+        * @param WP_Post $post     The post been password checked.
+        * @return bool Result of password check taking in to account REST API considerations.
+        */
+       public function check_password_required( $required, $post ) {
+               if ( ! $required ) {
+                       return $required;
+               }
+
+               $post = get_post( $post );
+
+               if ( ! $post ) {
+                       return $required;
+               }
+
+               if ( ! empty( $this->password_check_passed[ $post->ID ] ) ) {
+                       // Password previously checked and approved.
+                       return false;
+               }
+
+               return ! current_user_can( 'edit_post', $post->ID );
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Retrieves a collection of posts.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,7 +355,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Allow access to all password protected posts if the context is edit.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'edit' === $request['context'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        add_filter( 'post_password_required', '__return_false' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 add_filter( 'post_password_required', array( $this, 'check_password_required' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $posts = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Reset filter.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'edit' === $request['context'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        remove_filter( 'post_password_required', '__return_false' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 remove_filter( 'post_password_required', array( $this, 'check_password_required' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $page        = (int) $query_args['paged'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Allow access to all password protected posts if the context is edit.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'edit' === $request['context'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        add_filter( 'post_password_required', '__return_false' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 add_filter( 'post_password_required', array( $this, 'check_password_required' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $post ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,8 +514,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return false;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Edit context always gets access to password-protected posts.
-               if ( 'edit' === $request['context'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*
+                * Users always gets access to password protected content in the edit
+                * context if they have the `edit_post` meta capability.
+                */
+               if (
+                       'edit' === $request['context'] &&
+                       current_user_can( 'edit_post', $post->ID )
+               ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return true;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1705,8 +1751,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $has_password_filter = false;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $this->can_access_password_content( $post, $request ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        $this->password_check_passed[ $post->ID ] = true;
</ins><span class="cx" style="display: block; padding: 0 10px">                         // Allow access to the post, permissions already checked before.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        add_filter( 'post_password_required', '__return_false' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 add_filter( 'post_password_required', array( $this, 'check_password_required' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        $has_password_filter = true;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1744,7 +1791,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $has_password_filter ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // Reset filter.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        remove_filter( 'post_password_required', '__return_false' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 remove_filter( 'post_password_required', array( $this, 'check_password_required' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( rest_is_field_included( 'author', $fields ) ) {
</span></span></pre></div>
<a id="branches56testsphpunittestsrestapirestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/tests/phpunit/tests/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/tests/phpunit/tests/rest-api/rest-posts-controller.php       2021-04-15 01:05:12 UTC (rev 50725)
+++ branches/5.6/tests/phpunit/tests/rest-api/rest-posts-controller.php 2021-04-15 01:06:00 UTC (rev 50726)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1609,6 +1609,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertErrorResponse( 'rest_forbidden', $response, 401 );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        public function test_get_post_draft_edit_context() {
+               $post_content = 'Hello World!';
+               $this->factory->post->create(
+                       array(
+                               'post_title'    => 'Hola',
+                               'post_password' => 'password',
+                               'post_content'  => $post_content,
+                               'post_excerpt'  => $post_content,
+                               'post_author'   => self::$editor_id,
+                       )
+               );
+               $draft_id = $this->factory->post->create(
+                       array(
+                               'post_status'  => 'draft',
+                               'post_author'  => self::$contributor_id,
+                               'post_content' => '<!-- wp:latest-posts {"displayPostContent":true} /--> <!-- wp:latest-posts {"displayPostContent":true,"displayPostContentRadio":"full_post"} /-->',
+                       )
+               );
+               wp_set_current_user( self::$contributor_id );
+               $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', $draft_id ) );
+               $request->set_param( 'context', 'edit' );
+               $response = rest_get_server()->dispatch( $request );
+               $data     = $response->get_data();
+               $this->assertNotContains( $post_content, $data['content']['rendered'] );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         public function test_get_post_invalid_id() {
</span><span class="cx" style="display: block; padding: 0 10px">                $request  = new WP_REST_Request( 'GET', '/wp/v2/posts/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );
</span></span></pre>
</div>
</div>

</body>
</html>