<!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>[49405] branches/4.1: 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/49405">49405</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/49405","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 19:09:27 +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.1 branch.
Props xknown, zieladam, peterwilsoncc, whyisjake, desrosj, dd32.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41srcwpadminadminheaderphp">branches/4.1/src/wp-admin/admin-header.php</a></li>
<li><a href="#branches41srcwpadmincustombackgroundphp">branches/4.1/src/wp-admin/custom-background.php</a></li>
<li><a href="#branches41srcwpadmincustomheaderphp">branches/4.1/src/wp-admin/custom-header.php</a></li>
<li><a href="#branches41srcwpadminincludesmediaphp">branches/4.1/src/wp-admin/includes/media.php</a></li>
<li><a href="#branches41srcwpadminincludesmsphp">branches/4.1/src/wp-admin/includes/ms.php</a></li>
<li><a href="#branches41srcwpadminincludestemplatephp">branches/4.1/src/wp-admin/includes/template.php</a></li>
<li><a href="#branches41srcwpadminjscustombackgroundjs">branches/4.1/src/wp-admin/js/custom-background.js</a></li>
<li><a href="#branches41srcwpadminjsmediagalleryjs">branches/4.1/src/wp-admin/js/media-gallery.js</a></li>
<li><a href="#branches41srcwpadminmedianewphp">branches/4.1/src/wp-admin/media-new.php</a></li>
<li><a href="#branches41srcwpadminnetworksiteusersphp">branches/4.1/src/wp-admin/network/site-users.php</a></li>
<li><a href="#branches41srcwpincludesclasswpxmlrpcserverphp">branches/4.1/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#branches41srcwpincludesmetaphp">branches/4.1/src/wp-includes/meta.php</a></li>
<li><a href="#branches41testsphpunittestsformattingUtf8UriEncodephp">branches/4.1/tests/phpunit/tests/formatting/Utf8UriEncode.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches41testsphpunittestsmetaisProtectedMetaphp">branches/4.1/tests/phpunit/tests/meta/isProtectedMeta.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches41">branches/4.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.1
</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.1 2020-10-29 19:07:43 UTC (rev 49404)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.1 2020-10-29 19:09:27 UTC (rev 49405)
</ins><a id="branches41"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.1</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
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:30801-30813,30817,30821,30823-30824,30828-30847,30849,30852-30857,30860,30865-30869,30871-30874,30879,30884-30891,30893,30896-30897,30899-30901,30903,30905,30907,30910,30912,30921,30929,30932,30944-30946,30951-30956,30961,30967,30971,30985,30991,30993,31010,31023,31071,31073,31140,31179-31180,31203,31251,31253-31254,31257-31259,31273,31329,31339,31342,31360,31362,31386,31390,31429,31432,33124,33142,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241,40400,40538,40604,40677,40692,40704,40723,40736,41072,41393,41395,41398,41457,41470,41483,41496,41522,41662,41712,42056,42119-42120,42258-42261,42424,42433,42892-42893,44021,44048,44842,44993,45936,45971,45997,46474-46478,46483,46485,46895,47341,47947-47951,48241
</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:30801-30813,30817,30821,30823-30824,30828-30847,30849,30852-30857,30860,30865-30869,30871-30874,30879,30884-30891,30893,30896-30897,30899-30901,30903,30905,30907,30910,30912,30921,30929,30932,30944-30946,30951-30956,30961,30967,30971,30985,30991,30993,31010,31023,31071,31073,31140,31179-31180,31203,31251,31253-31254,31257-31259,31273,31329,31339,31342,31360,31362,31386,31390,31429,31432,33124,33142,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241,40400,40538,40604,40677,40692,40704,40723,40736,41072,41393,41395,41398,41457,41470,41483,41496,41522,41662,41712,42056,42119-42120,42258-42261,42424,42433,42892-42893,44021,44048,44842,44993,45936,45971,45997,46474-46478,46483,46485,46895,47341,47947-47951,48241,49380,49382-49388
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches41srcwpadminadminheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/admin-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/admin-header.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/admin-header.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,13 +58,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="branches41srcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/custom-background.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/custom-background.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,6 +516,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="branches41srcwpadmincustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/custom-header.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/custom-header.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,7 +392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> /* <![CDATA[ */
</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="branches41srcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/includes/media.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/includes/media.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="cx" style="display: block; padding: 0 10px"> //<![CDATA[
</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"> //]]>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span></span></pre></div>
<a id="branches41srcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/includes/ms.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/includes/ms.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,7 +956,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"> //<![CDATA[
</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"> //]]>
</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="branches41srcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/includes/template.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/includes/template.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1547,12 +1547,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //<![CDATA[
</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"> //]]>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span></span></pre></div>
<a id="branches41srcwpadminjscustombackgroundjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/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.1/src/wp-admin/js/custom-background.js 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/js/custom-background.js 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,11 +56,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="branches41srcwpadminjsmediagalleryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/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.1/src/wp-admin/js/media-gallery.js 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/js/media-gallery.js 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global ajaxurl */
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(function($){
</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"> ( window.dialogArguments || opener || parent || top ).location.href = target.data( 'location' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( target.hasClass( 'wp-set-background' ) ) {
</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"> 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="branches41srcwpadminmedianewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-admin/media-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-admin/media-new.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/media-new.php 2020-10-29 19:09:27 UTC (rev 49405)
</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="branches41srcwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/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.1/src/wp-admin/network/site-users.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-admin/network/site-users.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +178,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"> /* <![CDATA[ */
</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"> /* ]]> */
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches41srcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/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.1/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3292,6 +3292,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! get_post($post_id) )
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Invalid post ID.' ) );
</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['comment_post_ID'] = $post_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3608,8 +3623,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="branches41srcwpincludesmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-includes/meta.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/src/wp-includes/meta.php 2020-10-29 19:09:27 UTC (rev 49405)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1550,8 +1550,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|null $meta_type
</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"> * Filter whether a meta key is protected.
</span></span></pre></div>
<a id="branches41testsphpunittestsformattingUtf8UriEncodephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/tests/phpunit/tests/formatting/Utf8UriEncode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/formatting/Utf8UriEncode.php 2020-10-29 19:07:43 UTC (rev 49404)
+++ branches/4.1/tests/phpunit/tests/formatting/Utf8UriEncode.php 2020-10-29 19:09:27 UTC (rev 49405)
</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="branches41testsphpunittestsmetaisProtectedMetaphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/4.1/tests/phpunit/tests/meta/isProtectedMeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/meta/isProtectedMeta.php (rev 0)
+++ branches/4.1/tests/phpunit/tests/meta/isProtectedMeta.php 2020-10-29 19:09:27 UTC (rev 49405)
</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>
</div>
</body>
</html>