<!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>[49397] branches/4.9: General: WordPress updates</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/49397">49397</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/49397","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>2020-10-29 18:52:29 +0000 (Thu, 29 Oct 2020)</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'>General: WordPress updates
* XML-RPC: Improve error messages for unprivileged users.
* External Libraries: Disable deserialization in Requests_Utility_FilteredIterator
* Embeds: Disable embeds on deactivated Multisite sites.
* Coding standards: Modify escaping functions to avoid potential false positives.
* XML-RPC: Return error message if attachment ID is incorrect.
* Upgrade/install: Improve logic check when determining installation status.
* Meta: Sanitize meta key before checking protection status.
* Themes: Ensure that only privileged users can set a background image when a theme is using the deprecated custom background page.
Brings the changes from [49380,49382-49388] to the 4.9 branch.
Props xknown, zieladam, peterwilsoncc, whyisjake, desrosj, dd32.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpadminadminheaderphp">branches/4.9/src/wp-admin/admin-header.php</a></li>
<li><a href="#branches49srcwpadmincustombackgroundphp">branches/4.9/src/wp-admin/custom-background.php</a></li>
<li><a href="#branches49srcwpadmincustomheaderphp">branches/4.9/src/wp-admin/custom-header.php</a></li>
<li><a href="#branches49srcwpadminincludesmediaphp">branches/4.9/src/wp-admin/includes/media.php</a></li>
<li><a href="#branches49srcwpadminincludesmsphp">branches/4.9/src/wp-admin/includes/ms.php</a></li>
<li><a href="#branches49srcwpadminincludestemplatephp">branches/4.9/src/wp-admin/includes/template.php</a></li>
<li><a href="#branches49srcwpadminjscustombackgroundjs">branches/4.9/src/wp-admin/js/custom-background.js</a></li>
<li><a href="#branches49srcwpadminjsmediagalleryjs">branches/4.9/src/wp-admin/js/media-gallery.js</a></li>
<li><a href="#branches49srcwpadminmedianewphp">branches/4.9/src/wp-admin/media-new.php</a></li>
<li><a href="#branches49srcwpadminnetworksiteusersphp">branches/4.9/src/wp-admin/network/site-users.php</a></li>
<li><a href="#branches49srcwpincludesRequestsUtilityFilteredIteratorphp">branches/4.9/src/wp-includes/Requests/Utility/FilteredIterator.php</a></li>
<li><a href="#branches49srcwpincludesclasswpxmlrpcserverphp">branches/4.9/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#branches49srcwpincludesembedphp">branches/4.9/src/wp-includes/embed.php</a></li>
<li><a href="#branches49srcwpincludesformattingphp">branches/4.9/src/wp-includes/formatting.php</a></li>
<li><a href="#branches49srcwpincludesmetaphp">branches/4.9/src/wp-includes/meta.php</a></li>
<li><a href="#branches49testsphpunittestsformattingUtf8UriEncodephp">branches/4.9/tests/phpunit/tests/formatting/Utf8UriEncode.php</a></li>
<li><a href="#branches49testsphpunittestsmultisitesitephp">branches/4.9/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches49testsphpunittestsmetaisProtectedMetaphp">branches/4.9/tests/phpunit/tests/meta/isProtectedMeta.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</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.9 2020-10-29 18:50:55 UTC (rev 49396)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9 2020-10-29 18:52:29 UTC (rev 49397)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</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/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.8:42204
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43807,43988,43994,44014,44017,44047,45005
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42432-42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42676,42687,42695,42697,42702,42711,42713,42719,42722,42726,42728,42739-42740,42744,42758,42772,42791-42792,42801,42814-42815,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42888-42889
,42892-42894,42930,42964,42967,42971-42972,42977-42978,42980-42982,42985-42987,42989,42992,42994-42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43049,43051-43063,43065,43081,43085,43087-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43154-43155,43158,43160,43162,43166,43168,43170,43172,43175,43180-43181,43183-43185,43189,43191,43193,43195,43197,43199,43201,43203,43206,43208,43210-43212,43216,43218,43220,43222-43223,43226,43228,43230,43232,43234,43236,43238,43242-43243,43245-43246,43248-43251,43256,43259-43260,43263,43265,43267,43269,43274-43275,43278-43279,43282,43284,43286,43290-43293,43299,43303-43304,43313,43315,43317,43331,43337,43343,43350,43353,43356,43361-43363,43365,43367,43370-43371,43373-43376,43379,43388,43390,43435,43437,43439-43440,43446-43447,43451,43454,43457,43460,43462-43467,43469,43471,43475,43477-43478,43480,43486,43491,43493,43495,
43499,43504,43506,43508,43511-43513,43518,43525,43527,43529,43531,43541,43550,43559,43567,43580,43593,43597,43599,43609,43636,43638,43653,44021,44048,44833,44842,44993,45936,45971,45990,45997,46893,46895,47341,47633-47635,47637-47638,47949-47951,48241,48338,48341
</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">+/branches/5.5:49373-49379,49381
+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42432-42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42676,42687,42695,42697,42702,42711,42713,42719,42722,42726,42728,42739-42740,42744,42758,42772,42791-42792,42801,42814-42815,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42888-42889,42892-42894,42930,42964,42967,42971-42972,42977-42978,42980-42982,42985-42987,42989,42992,42994-
42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43049,43051-43063,43065,43081,43085,43087-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43154-43155,43158,43160,43162,43166,43168,43170,43172,43175,43180-43181,43183-43185,43189,43191,43193,43195,43197,43199,43201,43203,43206,43208,43210-43212,43216,43218,43220,43222-43223,43226,43228,43230,43232,43234,43236,43238,43242-43243,43245-43246,43248-43251,43256,43259-43260,43263,43265,43267,43269,43274-43275,43278-43279,43282,43284,43286,43290-43293,43299,43303-43304,43313,43315,43317,43331,43337,43343,43350,43353,43356,43361-43363,43365,43367,43370-43371,43373-43376,43379,43388,43390,43435,43437,43439-43440,43446-43447,43451,43454,43457,43460,43462-43467,43469,43471,43475,43477-43478,43480,43486,43491,43493,43495,43499,43504,43506,43508,43511-43513,43518,43525,43527,43529,43531,43541,43550,43559,43567,43580,4
3593,43597,43599,43609,43636,43638,43653,44021,44048,44833,44842,44993,45936,45971,45990,45997,46893,46895,47341,47633-47635,47637-47638,47949-47951,48241,48338,48341,49380,49382-49388
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpadminadminheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/admin-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/admin-header.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/admin-header.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,13 +75,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
- pagenow = '<?php echo $current_screen->id; ?>',
- typenow = '<?php echo $current_screen->post_type; ?>',
- adminpage = '<?php echo $admin_body_class; ?>',
- thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
- decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+addLoadEvent = function(func){if(typeof jQuery!=='undefined')jQuery(document).ready(func);else if(typeof wpOnload!=='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
+ pagenow = '<?php echo esc_js( $current_screen->id ); ?>',
+ typenow = '<?php echo esc_js( $current_screen->post_type ); ?>',
+ adminpage = '<?php echo esc_js( $admin_body_class ); ?>',
+ thousandsSeparator = '<?php echo esc_js( $wp_locale->number_format['thousands_sep'] ); ?>',
+ decimalPoint = '<?php echo esc_js( $wp_locale->number_format['decimal_point'] ); ?>',
</ins><span class="cx" style="display: block; padding: 0 10px"> isRtl = <?php echo (int) is_rtl(); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
</span></span></pre></div>
<a id="branches49srcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/custom-background.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/custom-background.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,6 +541,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function wp_set_background_image() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ check_ajax_referer( 'custom-background' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = absint($_POST['attachment_id']);
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span></span></pre></div>
<a id="branches49srcwpadmincustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/custom-header.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/custom-header.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> (function($){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var default_color = '<?php echo $default_color; ?>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var default_color = '<?php echo esc_js( $default_color ); ?>',
</ins><span class="cx" style="display: block; padding: 0 10px"> header_text_fields;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function pickColor(color) {
</span></span></pre></div>
<a id="branches49srcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/media.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/includes/media.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
</ins><span class="cx" style="display: block; padding: 0 10px"> isRtl = <?php echo (int) is_rtl(); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="branches49srcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/ms.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/includes/ms.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +745,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _thickbox_path_admin_subfolder() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var tb_pathToImage = "<?php echo includes_url( 'js/thickbox/loadingAnimation.gif', 'relative' ); ?>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var tb_pathToImage = "<?php echo esc_js( includes_url( 'js/thickbox/loadingAnimation.gif', 'relative' ) ); ?>";
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches49srcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/template.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/includes/template.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1641,12 +1641,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span><span class="cx" style="display: block; padding: 0 10px"> function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
- pagenow = '<?php echo $current_screen->id; ?>',
- typenow = '<?php echo $current_screen->post_type; ?>',
- adminpage = '<?php echo $admin_body_class; ?>',
- thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
- decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
+ pagenow = '<?php echo esc_js( $current_screen->id ); ?>',
+ typenow = '<?php echo esc_js( $current_screen->post_type ); ?>',
+ adminpage = '<?php echo esc_js( $admin_body_class ); ?>',
+ thousandsSeparator = '<?php echo esc_js( $wp_locale->number_format['thousands_sep'] ); ?>',
+ decimalPoint = '<?php echo esc_js( $wp_locale->number_format['decimal_point'] ); ?>',
</ins><span class="cx" style="display: block; padding: 0 10px"> isRtl = <?php echo (int) is_rtl(); ?>;
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="branches49srcwpadminjscustombackgroundjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/js/custom-background.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/js/custom-background.js 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/js/custom-background.js 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,11 +122,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> frame.on( 'select', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Grab the selected attachment.
</span><span class="cx" style="display: block; padding: 0 10px"> var attachment = frame.state().get('selection').first();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var nonceValue = $( '#_wpnonce' ).val() || '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Run an AJAX request to set the background image.
</span><span class="cx" style="display: block; padding: 0 10px"> $.post( ajaxurl, {
</span><span class="cx" style="display: block; padding: 0 10px"> action: 'set-background-image',
</span><span class="cx" style="display: block; padding: 0 10px"> attachment_id: attachment.id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _ajax_nonce: nonceValue,
</ins><span class="cx" style="display: block; padding: 0 10px"> size: 'full'
</span><span class="cx" style="display: block; padding: 0 10px"> }).done( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> // When the request completes, reload the window.
</span></span></pre></div>
<a id="branches49srcwpadminjsmediagalleryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/js/media-gallery.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/js/media-gallery.js 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/js/media-gallery.js 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds a click event handler to the element with a 'wp-gallery' class.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).bind( 'click.wp-gallery', function(e) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var target = $( e.target ), id, img_size;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var target = $( e.target ), id, img_size, nonceValue;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( target.hasClass( 'wp-set-header' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Opens the image to preview it full size.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Sets the image as background of the theme.
</span><span class="cx" style="display: block; padding: 0 10px"> id = target.data( 'attachment-id' );
</span><span class="cx" style="display: block; padding: 0 10px"> img_size = $( 'input[name="attachments[' + id + '][image-size]"]:checked').val();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ nonceValue = $( '#_wpnonce' ).val() && '';
</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"> * This AJAX action has been deprecated since 3.5.0, see custom-background.php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery.post(ajaxurl, {
</span><span class="cx" style="display: block; padding: 0 10px"> action: 'set-background-image',
</span><span class="cx" style="display: block; padding: 0 10px"> attachment_id: id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _ajax_nonce: nonceValue,
</ins><span class="cx" style="display: block; padding: 0 10px"> size: img_size
</span><span class="cx" style="display: block; padding: 0 10px"> }, function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var win = window.dialogArguments || opener || parent || top;
</span></span></pre></div>
<a id="branches49srcwpadminmedianewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/media-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/media-new.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/media-new.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,9 +72,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php media_upload_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var post_id = <?php echo $post_id; ?>, shortform = 3;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var post_id = <?php echo absint( $post_id ); ?>, shortform = 3;
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="post_id" id="post_id" value="<?php echo absint( $post_id ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field('media-form'); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="media-items" class="hide-if-no-js"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span></span></pre></div>
<a id="branches49srcwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/network/site-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/network/site-users.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-admin/network/site-users.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var current_site_id = <?php echo $id; ?>;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var current_site_id = <?php echo absint( $id ); ?>;
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</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="branches49srcwpincludesRequestsUtilityFilteredIteratorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/Requests/Utility/FilteredIterator.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/Requests/Utility/FilteredIterator.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-includes/Requests/Utility/FilteredIterator.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,4 +42,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = call_user_func($this->callback, $value);
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches49srcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3638,6 +3638,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'Comment is required.' ) );
</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">+ if (
+ 'publish' === get_post_status( $post_id ) &&
+ ! current_user_can( 'edit_post', $post_id ) &&
+ post_password_required( $post_id )
+ ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) );
+ }
+
+ if (
+ 'private' === get_post_status( $post_id ) &&
+ ! current_user_can( 'read_post', $post_id )
+ ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content' => $content_struct['content'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4023,8 +4038,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getMediaItem' );
</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 ( ! $attachment = get_post($attachment_id) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = get_post( $attachment_id );
+ if ( ! $attachment || 'attachment' !== $attachment->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->_prepare_media_item( $attachment );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches49srcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/embed.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-includes/embed.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1094,7 +1094,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sites = get_sites( $qv );
</span><span class="cx" style="display: block; padding: 0 10px"> $site = reset( $sites );
</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 ( $site && (int) $site->blog_id !== get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not allow embeds for deleted/archived/spam sites.
+ if ( ! empty( $site->deleted ) || ! empty( $site->spam ) || ! empty( $site->archived ) ) {
+ return false;
+ }
+
+ if ( $site && get_current_blog_id() !== (int) $site->blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site->blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches49srcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/formatting.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-includes/formatting.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1090,9 +1090,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string String with Unicode encoded for URI.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function utf8_uri_encode( $utf8_string, $length = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $unicode = '';
- $values = array();
- $num_octets = 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $unicode = '';
+ $values = array();
+ $num_octets = 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $unicode_length = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> mbstring_binary_safe_encoding();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1104,9 +1104,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = ord( $utf8_string[ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value < 128 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $length && ( $unicode_length >= $length ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $length && ( $unicode_length >= $length ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $unicode .= chr($value);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ $unicode .= chr( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> $unicode_length++;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $values ) == 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2007,7 +2008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if (function_exists('mb_strtolower')) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = mb_strtolower($title, 'UTF-8');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = utf8_uri_encode($title, 200);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = utf8_uri_encode( $title, 200 );
</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"> $title = strtolower($title);
</span></span></pre></div>
<a id="branches49srcwpincludesmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/meta.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/src/wp-includes/meta.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -923,8 +923,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * term, or user).
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the key is protected, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function is_protected_meta( $meta_key, $meta_type = null ) {
- $protected = ( '_' == $meta_key[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function is_protected_meta( $meta_key, $meta_type = '' ) {
+ $sanitized_key = preg_replace( "/[^\x20-\x7E\p{L}]/", '', $meta_key );
+ $protected = strlen( $sanitized_key ) > 0 && ( '_' === $sanitized_key[0] );
</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"> * Filters whether a meta key is protected.
</span></span></pre></div>
<a id="branches49testsphpunittestsformattingUtf8UriEncodephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/tests/phpunit/tests/formatting/Utf8UriEncode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/tests/phpunit/tests/formatting/Utf8UriEncode.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/tests/phpunit/tests/formatting/Utf8UriEncode.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_percent_encodes_non_reserved_characters( $utf8, $urlencoded ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals($urlencoded, utf8_uri_encode( $utf8 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $urlencoded, utf8_uri_encode( $utf8 ) );
</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="branches49testsphpunittestsmetaisProtectedMetaphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/4.9/tests/phpunit/tests/meta/isProtectedMeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/tests/phpunit/tests/meta/isProtectedMeta.php (rev 0)
+++ branches/4.9/tests/phpunit/tests/meta/isProtectedMeta.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,55 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group meta
+ * @covers ::is_protected_meta
+ */
+class Tests_Meta_isProtectedMeta extends WP_UnitTestCase {
+
+ /**
+ * @dataProvider protected_data
+ */
+ public function test_protected( $key ) {
+ $this->assertTrue( is_protected_meta( $key ) );
+ }
+
+ public function protected_data() {
+ $protected_keys = array(
+ array( '_wp_attachment' ),
+ );
+ for ( $i = 0, $max = 31; $i < $max; $i ++ ) {
+ $protected_keys[] = array( chr( $i ) . '_wp_attachment' );
+ }
+ for ( $i = 127, $max = 159; $i <= $max; $i ++ ) {
+ $protected_keys[] = array( chr( $i ) . '_wp_attachment' );
+ }
+ $protected_keys[] = array( chr( 95 ) . '_wp_attachment' );
+
+ return $protected_keys;
+ }
+
+ /**
+ * @dataProvider unprotected_data
+ */
+ public function test_unprotected( $key ) {
+ $this->assertFalse( is_protected_meta( $key ) );
+ }
+
+ public function unprotected_data() {
+ $unprotected_keys = array(
+ array( 'singleword' ),
+ array( 'two_words' ),
+ array( 'ąŌ_not_so_protected_meta' ),
+ );
+
+ for ( $i = 32, $max = 94; $i <= $max; $i ++ ) {
+ $unprotected_keys[] = array( chr( $i ) . '_wp_attachment' );
+ }
+ for ( $i = 96, $max = 126; $i <= $max; $i ++ ) {
+ $unprotected_keys[] = array( chr( $i ) . '_wp_attachment' );
+ }
+
+ return $unprotected_keys;
+ }
+
+}
</ins></span></pre></div>
<a id="branches49testsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/tests/phpunit/tests/multisite/site.php 2020-10-29 18:50:55 UTC (rev 49396)
+++ branches/4.9/tests/phpunit/tests/multisite/site.php 2020-10-29 18:52:29 UTC (rev 49397)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,6 +445,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
</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">+ function test_content_from_spam_blog_is_not_available() {
+ $spam_blog_id = self::factory()->blog->create();
+ switch_to_blog( $spam_blog_id );
+ $post_data = array(
+ 'post_title' => 'Hello World!',
+ 'post_content' => 'Hello world content',
+ );
+ $post_id = self::factory()->post->create( $post_data );
+ $post = get_post( $post_id );
+ $spam_permalink = site_url() . '/?p=' . $post->ID;
+ $spam_embed_url = get_post_embed_url( $post_id );
+
+ restore_current_blog();
+ $this->assertNotEmpty( $spam_permalink );
+ $this->assertEquals( $post_data['post_title'], $post->post_title );
+
+ update_blog_status( $spam_blog_id, 'spam', 1 );
+
+ $post_id = self::factory()->post->create(
+ array(
+ 'post_content' => "\n $spam_permalink \n",
+ )
+ );
+ $post = get_post( $post_id );
+ $content = apply_filters( 'the_content', $post->post_content );
+
+ $this->assertNotContains( $post_data['post_title'], $content );
+ $this->assertNotContains( "src=\"{$spam_embed_url}#?", $content );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_update_blog_status_make_spam_blog_action() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $test_action_counter;
</span><span class="cx" style="display: block; padding: 0 10px"> $test_action_counter = 0;
</span></span></pre>
</div>
</div>
</body>
</html>