<!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>[46495] branches/4.7: Backporting several bug fixes.</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/46495">46495</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/46495","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-10-14 18:49:56 +0000 (Mon, 14 Oct 2019)</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'>Backporting several bug fixes.
- Query: Remove the static query property.
- HTTP API: Protect against hex interpretation.
- Filesystem API: Prevent directory travelersals when creating new folders.
- Administration: Ensure that admin referer nonce is valid.
- REST API: Send a Vary: Origin header on GET requests.
Backports <a href="https://core.trac.wordpress.org/changeset/46474">[46474]</a>, <a href="https://core.trac.wordpress.org/changeset/46475">[46475]</a>, <a href="https://core.trac.wordpress.org/changeset/46476">[46476]</a>, <a href="https://core.trac.wordpress.org/changeset/46477">[46477]</a>, <a href="https://core.trac.wordpress.org/changeset/46478">[46478]</a>, <a href="https://core.trac.wordpress.org/changeset/46483">[46483]</a>, <a href="https://core.trac.wordpress.org/changeset/46485">[46485]</a> to the 4.7 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludesclasswpqueryphp">branches/4.7/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#branches47srcwpincludesclasswpphp">branches/4.7/src/wp-includes/class-wp.php</a></li>
<li><a href="#branches47srcwpincludesfunctionsphp">branches/4.7/src/wp-includes/functions.php</a></li>
<li><a href="#branches47srcwpincludeshttpphp">branches/4.7/src/wp-includes/http.php</a></li>
<li><a href="#branches47srcwpincludespluggablephp">branches/4.7/src/wp-includes/pluggable.php</a></li>
<li><a href="#branches47srcwpincludesrestapiphp">branches/4.7/src/wp-includes/rest-api.php</a></li>
<li><a href="#branches47testsphpunittestsauthphp">branches/4.7/tests/phpunit/tests/auth.php</a></li>
<li><a href="#branches47testsphpunittestsqueryvarsphp">branches/4.7/tests/phpunit/tests/query/vars.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</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/4.7 2019-10-14 18:44:54 UTC (rev 46494)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2019-10-14 18:49:56 UTC (rev 46495)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</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.8:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43988,43994,44014,44017,44047,45005
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058,40061
,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40268-40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40364,40368,40376,40378-40382,40395-40398,40400,40405,40421,40428,40434,40458,40472,40481,40513,40523,40536,40538-40539,40546,40604,40677,40689,40692,40704,40716,40723,40736,40851-40853,40872-40873,41072,41294,41393,41395,41397-41398,41448,41457,41470,41483,41496,41522,41662,41870,42056,42119-42120,42220,42258-42261,42424,42433,42892-42894,44021,44048,44833,44842,44993,45936,45971,45990,45997
</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:39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058,40061
,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40268-40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40364,40368,40376,40378-40382,40395-40398,40400,40405,40421,40428,40434,40458,40472,40481,40513,40523,40536,40538-40539,40546,40604,40677,40689,40692,40704,40716,40723,40736,40851-40853,40872-40873,41072,41294,41393,41395,41397-41398,41448,41457,41470,41483,41496,41522,41662,41870,42056,42119-42120,42220,42258-42261,42424,42433,42892-42894,44021,44048,44833,44842,44993,45936,45971,45990,45997,46474-46478,46483,46485
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludesclasswpqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/class-wp-query.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/src/wp-includes/class-wp-query.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +582,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> , 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'attachment_id'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'name'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- , 'static'
</del><span class="cx" style="display: block; padding: 0 10px"> , 'pagename'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'page_id'
</span><span class="cx" style="display: block; padding: 0 10px"> , 'second'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -811,7 +810,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If year, month, day, hour, minute, and second are set, a single
</span><span class="cx" style="display: block; padding: 0 10px"> // post is being queried.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_single = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_page = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_single = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3048,7 +3047,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->found_posts = count( $this->posts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $this->posts ) ) {
+ $this->found_posts = count( $this->posts );
+ } else {
+ if ( null === $this->posts ) {
+ $this->found_posts = 0;
+ } else {
+ $this->found_posts = 1;
+ }
+ }
</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"> /**
</span></span></pre></div>
<a id="branches47srcwpincludesclasswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/class-wp.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/src/wp-includes/class-wp.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
</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"> * Private query variables.
</span></span></pre></div>
<a id="branches47srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/functions.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/src/wp-includes/functions.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1608,6 +1608,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $target ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return @is_dir( $target );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not allow path traversals.
+ if ( false !== strpos( $target, '../' ) || false !== strpos( $target, '..' . DIRECTORY_SEPARATOR ) ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We need to find the permissions of the parent folder that exists and inherit that.
</span><span class="cx" style="display: block; padding: 0 10px"> $target_parent = dirname( $target );
</span><span class="cx" style="display: block; padding: 0 10px"> while ( '.' != $target_parent && ! is_dir( $target_parent ) ) {
</span></span></pre></div>
<a id="branches47srcwpincludeshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/http.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/src/wp-includes/http.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,8 +541,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ip = $host;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $ip = gethostbyname( $host );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ip === $host ) // Error condition for gethostbyname()
- $ip = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $ip === $host ) { // Error condition for gethostbyname()
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ip ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parts = array_map( 'intval', explode( '.', $ip ) );
</span></span></pre></div>
<a id="branches47srcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/pluggable.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/src/wp-includes/pluggable.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1055,7 +1055,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( -1 == $action )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 === $action )
</ins><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $adminurl = strtolower(admin_url());
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1073,7 +1073,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'check_admin_referer', $action, $result );
</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 ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $result && ! ( -1 === $action && strpos( $referer, $adminurl ) === 0 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_ays( $action );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2518,4 +2518,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $r;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del></span></pre></div>
<a id="branches47srcwpincludesrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/rest-api.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/src/wp-includes/rest-api.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,7 +528,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Origin: ' . esc_url_raw( $origin ) );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Methods: OPTIONS, GET, POST, PUT, PATCH, DELETE' );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Credentials: true' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header( 'Vary: Origin' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( 'Vary: Origin', false );
+ } elseif ( ! headers_sent() && 'GET' === $_SERVER['REQUEST_METHOD'] && ! is_user_logged_in() ) {
+ header( 'Vary: Origin', false );
</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"> return $value;
</span></span></pre></div>
<a id="branches47testsphpunittestsauthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/auth.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/auth.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/tests/phpunit/tests/auth.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,6 +163,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_REQUEST['_wpnonce'] );
</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_check_admin_referer_with_default_action_as_string_not_doing_it_wrong() {
+ // A valid nonce needs to be set so the check doesn't die()
+ $_REQUEST['_wpnonce'] = wp_create_nonce( '-1' );
+ $result = check_admin_referer( '-1' );
+ $this->assertSame( 1, $result );
+
+ unset( $_REQUEST['_wpnonce'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36361
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="branches47testsphpunittestsqueryvarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/query/vars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/query/vars.php 2019-10-14 18:44:54 UTC (rev 46494)
+++ branches/4.7/tests/phpunit/tests/query/vars.php 2019-10-14 18:49:56 UTC (rev 46495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,61 +16,64 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Re-initialise any dynamically-added public query vars:
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'init' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals(
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Static public query vars:
- 'm',
- 'p',
- 'posts',
- 'w',
- 'cat',
- 'withcomments',
- 'withoutcomments',
- 's',
- 'search',
- 'exact',
- 'sentence',
- 'calendar',
- 'page',
- 'paged',
- 'more',
- 'tb',
- 'pb',
- 'author',
- 'order',
- 'orderby',
- 'year',
- 'monthnum',
- 'day',
- 'hour',
- 'minute',
- 'second',
- 'name',
- 'category_name',
- 'tag',
- 'feed',
- 'author_name',
- 'static',
- 'pagename',
- 'page_id',
- 'error',
- 'attachment',
- 'attachment_id',
- 'subpost',
- 'subpost_id',
- 'preview',
- 'robots',
- 'taxonomy',
- 'term',
- 'cpage',
- 'post_type',
- 'embed',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Static public query vars:
+ 'm',
+ 'p',
+ 'posts',
+ 'w',
+ 'cat',
+ 'withcomments',
+ 'withoutcomments',
+ 's',
+ 'search',
+ 'exact',
+ 'sentence',
+ 'calendar',
+ 'page',
+ 'paged',
+ 'more',
+ 'tb',
+ 'pb',
+ 'author',
+ 'order',
+ 'orderby',
+ 'year',
+ 'monthnum',
+ 'day',
+ 'hour',
+ 'minute',
+ 'second',
+ 'name',
+ 'category_name',
+ 'tag',
+ 'feed',
+ 'author_name',
+ 'pagename',
+ 'page_id',
+ 'error',
+ 'attachment',
+ 'attachment_id',
+ 'subpost',
+ 'subpost_id',
+ 'preview',
+ 'robots',
+ 'taxonomy',
+ 'term',
+ 'cpage',
+ 'post_type',
+ 'embed',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Dynamically added public query vars:
- 'post_format',
- 'rest_route',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Dynamically added public query vars:
+ 'post_format',
+ 'rest_route',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ), $wp->public_query_vars, 'Care should be taken when introducing new public query vars. See https://core.trac.wordpress.org/ticket/35115' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $wp->public_query_vars,
+ 'Care should be taken when introducing new public query vars. See https://core.trac.wordpress.org/ticket/35115'
+ );
</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"> }
</span></span></pre>
</div>
</div>
</body>
</html>