<!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>[48121] trunk: General: Remove {U+201C}whitelist{U+201D} and {U+201C}blacklist{U+201D} in favor of more clear and inclusive language.</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/48121">48121</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/48121","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-22 17:24:34 +0000 (Mon, 22 Jun 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: Remove {U+201C}whitelist{U+201D} and {U+201C}blacklist{U+201D} in favor of more clear and inclusive language.
{U+201C}The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included.{U+201D}
With this commit, all occurrences of {U+201C}whitelist{U+201D} and {U+201C}blacklist{U+201D} (with the single exception of the `$new_whitelist_options` global variable) are removed. A new ticket has been opened to explore renaming the `$new_whitelist_options` variable (<a href="https://core.trac.wordpress.org/ticket/50434">#50434</a>).
Changing to more specific names or rewording sentences containing these terms not only makes the code more inclusive, but also helps provide clarity. These terms are often ambiguous. What is being blocked or allowed is not always immediately clear. This can make it more difficult for non-native English speakers to read through the codebase.
Words matter. If one contributor feels more welcome because these terms are removed, this was worth the effort.
Props strangerstudios, jorbin, desrosj, joemcgill, timothyblynjacobs, ocean90, ayeshrajans, davidbaumwald, earnjam.
See <a href="https://core.trac.wordpress.org/ticket/48900">#48900</a>, <a href="https://core.trac.wordpress.org/ticket/50434">#50434</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/50413">#50413</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminuserprofilejs">trunk/src/js/_enqueues/admin/user-profile.js</a></li>
<li><a href="#trunksrcjs_enqueueswppasswordstrengthmeterjs">trunk/src/js/_enqueues/wp/password-strength-meter.js</a></li>
<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunksrcwpadminincludesdeprecatedphp">trunk/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteenpackagejson">trunk/src/wp-content/themes/twentynineteen/package.json</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentypackagejson">trunk/src/wp-content/themes/twentytwenty/package.json</a></li>
<li><a href="#trunksrcwpincludesRequestsSSLphp">trunk/src/wp-includes/Requests/SSL.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunksrcwpincludesclasswpdatequeryphp">trunk/src/wp-includes/class-wp-date-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorimagickphp">trunk/src/wp-includes/class-wp-image-editor-imagick.php</a></li>
<li><a href="#trunksrcwpincludesclasswpoembedcontrollerphp">trunk/src/wp-includes/class-wp-oembed-controller.php</a></li>
<li><a href="#trunksrcwpincludesclasswpoembedphp">trunk/src/wp-includes/class-wp-oembed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludeshttpphp">trunk/src/wp-includes/http.php</a></li>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesmsdefaultfiltersphp">trunk/src/wp-includes/ms-default-filters.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesmssitephp">trunk/src/wp-includes/ms-site.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesrestapiclasswprestserverphp">trunk/src/wp-includes/rest-api/class-wp-rest-server.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestsettingscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCoreEd25519php">trunk/src/wp-includes/sodium_compat/src/Core/Ed25519.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCore32Ed25519php">trunk/src/wp-includes/sodium_compat/src/Core32/Ed25519.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforblogphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesSchemaphp">trunk/tests/phpunit/tests/admin/includesSchema.php</a></li>
<li><a href="#trunktestsphpunittestscommentcheckCommentphp">trunk/tests/phpunit/tests/comment/checkComment.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpAllowCommentphp">trunk/tests/phpunit/tests/comment/wpAllowComment.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpBlacklistCheckphp">trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesiteDetailsphp">trunk/tests/phpunit/tests/multisite/siteDetails.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitewpmuValidateUserSignupphp">trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php</a></li>
<li><a href="#trunktestsphpunittestspostattachmentsphp">trunk/tests/phpunit/tests/post/attachments.php</a></li>
<li><a href="#trunktestsphpunittestspostwpUniquePostSlugphp">trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiphp">trunk/tests/phpunit/tests/rest-api.php</a></li>
<li><a href="#trunktestsphpunittestswidgetstextwidgetphp">trunk/tests/phpunit/tests/widgets/text-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsphp">trunk/tests/phpunit/tests/widgets.php</a></li>
<li><a href="#trunktestsqunitfixtureswpapigeneratedjs">trunk/tests/qunit/fixtures/wp-api-generated.js</a></li>
<li><a href="#trunktestsqunitwpadminjspasswordstrengthmeterjs">trunk/tests/qunit/wp-admin/js/password-strength-meter.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminuserprofilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/user-profile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/user-profile.js 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/js/_enqueues/admin/user-profile.js 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strength = wp.passwordStrength.meter( pass1, wp.passwordStrength.userInputBlacklist(), pass1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ strength = wp.passwordStrength.meter( pass1, wp.passwordStrength.userInputDisallowedList(), pass1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( strength ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case -1:
</span></span></pre></div>
<a id="trunksrcjs_enqueueswppasswordstrengthmeterjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/password-strength-meter.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/password-strength-meter.js 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/js/_enqueues/wp/password-strength-meter.js 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,16 +22,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {string} password1 The subject password.
- * @param {Array} blacklist An array of words that will lower the entropy of
- * the password.
- * @param {string} password2 The password confirmation.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {string} password1 The subject password.
+ * @param {Array} disallowedList An array of words that will lower the entropy of
+ * the password.
+ * @param {string} password2 The password confirmation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {number} The password strength score.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- meter : function( password1, blacklist, password2 ) {
- if ( ! $.isArray( blacklist ) )
- blacklist = [ blacklist.toString() ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ meter : function( password1, disallowedList, password2 ) {
+ if ( ! $.isArray( disallowedList ) )
+ disallowedList = [ disallowedList.toString() ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (password1 != password2 && password2 && password2.length > 0)
</span><span class="cx" style="display: block; padding: 0 10px"> return 5;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return -1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var result = zxcvbn( password1, blacklist );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var result = zxcvbn( password1, disallowedList );
</ins><span class="cx" style="display: block; padding: 0 10px"> return result.score;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,20 +49,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Builds an array of words that should be penalized.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Certain words need to be penalized because it would lower the entropy of a
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * password if they were used. The blacklist is based on user input fields such
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * password if they were used. The disallowedList is based on user input fields such
</ins><span class="cx" style="display: block; padding: 0 10px"> * as username, first name, email etc.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.5.0 Use {@see 'userInputBlockList()'} instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return {string[]} The array of words to be blacklisted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return {string[]} The array of words to be disallowed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> userInputBlacklist : function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.deprecated( 'wp.passwordStrength.userInputBlacklist()', {
+ version: '5.5.0',
+ alternative: 'wp.passwordStrength.userInputDisallowedList()',
+ plugin: 'WordPress',
+ hint: wp.i18n.__( 'Please consider writing more inclusive code.' )
+ } );
+
+ return wp.passwordStrength.userInputDisallowedList();
+ },
+
+ /**
+ * Builds an array of words that should be penalized.
+ *
+ * Certain words need to be penalized because it would lower the entropy of a
+ * password if they were used. The disallowed list is based on user input fields such
+ * as username, first name, email etc.
+ *
+ * @since 5.5.0
+ *
+ * @return {string[]} The array of words to be disallowed.
+ */
+ userInputDisallowedList : function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var i, userInputFieldsLength, rawValuesLength, currentField,
</span><span class="cx" style="display: block; padding: 0 10px"> rawValues = [],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- blacklist = [],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ disallowedList = [],
</ins><span class="cx" style="display: block; padding: 0 10px"> userInputFields = [ 'user_login', 'first_name', 'last_name', 'nickname', 'display_name', 'email', 'url', 'description', 'weblog_title', 'admin_email' ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Collect all the strings we want to blacklist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Collect all the strings we want to disallow.
</ins><span class="cx" style="display: block; padding: 0 10px"> rawValues.push( document.title );
</span><span class="cx" style="display: block; padding: 0 10px"> rawValues.push( document.URL );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> rawValuesLength = rawValues.length;
</span><span class="cx" style="display: block; padding: 0 10px"> for ( i = 0; i < rawValuesLength; i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( rawValues[ i ] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- blacklist = blacklist.concat( rawValues[ i ].replace( /\W/g, ' ' ).split( ' ' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ disallowedList = disallowedList.concat( rawValues[ i ].replace( /\W/g, ' ' ).split( ' ' ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,15 +116,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove empty values, short words and duplicates. Short words are likely to
</span><span class="cx" style="display: block; padding: 0 10px"> * cause many false positives.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- blacklist = $.grep( blacklist, function( value, key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ disallowedList = $.grep( disallowedList, function( value, key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' === value || 4 > value.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $.inArray( value, blacklist ) === key;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $.inArray( value, disallowedList ) === key;
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return blacklist;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return disallowedList;
</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="trunksrcwpadminincludesadminfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/admin-filters.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Plugin hooks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'whitelist_options', 'option_update_filter' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'allowed_options', 'option_update_filter' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Plugin Install hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'install_plugins_featured', 'install_dashboard' );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,10 +47,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_whitelist = array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search', 'paused', 'auto-update-enabled', 'auto-update-disabled' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_statuses = array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search', 'paused', 'auto-update-enabled', 'auto-update-disabled' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $status = 'all';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], $status_whitelist, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], $allowed_statuses, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = $_REQUEST['plugin_status'];
</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="trunksrcwpadminincludesclasswpsitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1776,8 +1776,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test if HTTP requests are blocked.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * It's possible to block all outgoing communication (with the possibility of whitelisting hosts) via the
- * HTTP API. This may create problems for users as many features are running as services these days.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * It's possible to block all outgoing communication (with the possibility of allowing certain
+ * hosts) via the HTTP API. This may create problems for users as many features are running as
+ * services these days.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1833,8 +1834,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result['description'] .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>%s</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Name of the constant used. 2: List of hostnames whitelisted. */
- __( 'HTTP requests have been blocked by the %1$s constant, with some hosts whitelisted: %2$s.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Name of the constant used. 2: List of allowed hostnames. */
+ __( 'HTTP requests have been blocked by the %1$s constant, with some allowed hosts: %2$s.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>WP_HTTP_BLOCK_EXTERNAL</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> implode( ',', $hosts )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/deprecated.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/deprecated.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,8 +159,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.0.0 Use register_setting()
</span><span class="cx" style="display: block; padding: 0 10px"> * @see register_setting()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
- * Default whitelisted option key names include 'general', 'discussion', 'media',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $option_group A settings group name. Should correspond to an allowed option key name.
+ * Default allowed option key names include 'general', 'discussion', 'media',
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'reading', 'writing', 'misc', 'options', and 'privacy'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_name The name of an option to sanitize and save.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callable $sanitize_callback A callback function that sanitizes the option's value.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1530,7 +1530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['screen'] = 'export-personal-data';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::__construct( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent::__construct( $args );
</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="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/plugin.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2136,12 +2136,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* Whitelist functions */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Allowed list functions */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Refreshes the value of the options whitelist available via the 'whitelist_options' hook.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Refreshes the value of the allowed options list available via the 'allowed_options' hook.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * See the {@see 'whitelist_options'} filter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * See the {@see 'allowed_options'} filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2154,7 +2154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $new_whitelist_options;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $new_whitelist_options ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $options = add_option_whitelist( $new_whitelist_options, $options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options = add_option_allowed_list( $new_whitelist_options, $options );
</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 $options;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2161,70 +2161,70 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Adds an array of options to the options whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds an array of options to the list of allowed options.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $whitelist_options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $allowed_options
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $new_options
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $options
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">-function add_option_whitelist( $new_options, $options = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_option_allowed_list( $new_options, $options = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $whitelist_options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $allowed_options;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options = $options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options = $options;
</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"> foreach ( $new_options as $page => $keys ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $keys as $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $whitelist_options[ $page ] ) || ! is_array( $whitelist_options[ $page ] ) ) {
- $whitelist_options[ $page ] = array();
- $whitelist_options[ $page ][] = $key;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $allowed_options[ $page ] ) || ! is_array( $allowed_options[ $page ] ) ) {
+ $allowed_options[ $page ] = array();
+ $allowed_options[ $page ][] = $key;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pos = array_search( $key, $whitelist_options[ $page ], true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = array_search( $key, $allowed_options[ $page ], true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $pos ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options[ $page ][] = $key;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options[ $page ][] = $key;
</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 class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $whitelist_options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $allowed_options;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Removes a list of options from the options whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Removes a list of options from the allowed options list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.7.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $whitelist_options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $allowed_options
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $del_options
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $options
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">-function remove_option_whitelist( $del_options, $options = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function remove_option_allowed_list( $del_options, $options = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $whitelist_options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $allowed_options;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options = $options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options = $options;
</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"> foreach ( $del_options as $page => $keys ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $keys as $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $whitelist_options[ $page ] ) && is_array( $whitelist_options[ $page ] ) ) {
- $pos = array_search( $key, $whitelist_options[ $page ], true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $allowed_options[ $page ] ) && is_array( $allowed_options[ $page ] ) ) {
+ $pos = array_search( $key, $allowed_options[ $page ], true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $pos ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $whitelist_options[ $page ][ $pos ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $allowed_options[ $page ][ $pos ] );
</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 class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $whitelist_options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $allowed_options;
</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="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/post.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2234,7 +2234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_block_editor_server_block_settings() {
</span><span class="cx" style="display: block; padding: 0 10px"> $block_registry = WP_Block_Type_Registry::get_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $blocks = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields_to_pick = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields_to_pick = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'icon' => 'icon',
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/schema.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,8 +446,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'recently_edited' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'template' => $template,
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $stylesheet,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment_whitelist' => 1,
- 'blacklist_keys' => '',
</del><span class="cx" style="display: block; padding: 0 10px"> 'comment_registration' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'html_type' => 'text/html',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,6 +530,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 5.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin_email_lifespan' => ( time() + 6 * MONTH_IN_SECONDS ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // 5.5.0
+ 'blocklist_keys' => '',
+ 'comment_previously_approved' => 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"> // 3.3.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,7 +552,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wp_parse_args( $options, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set autoload to no for these options.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fat_options = array( 'moderation_keys', 'recently_edited', 'blocklist_keys', 'uninstall_plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = "'" . implode( "', '", array_keys( $options ) ) . "'";
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1140,7 +1142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes[ WP_DEFAULT_THEME ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If WP_DEFAULT_THEME doesn't exist, also whitelist the latest core default theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If WP_DEFAULT_THEME doesn't exist, also include the latest core default theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $core_default = WP_Theme::get_core_default_theme();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $core_default ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,7 +835,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> upgrade_530();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wp_current_db_version < 47597 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_current_db_version < 48082 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> upgrade_550();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2168,6 +2168,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_550() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'finished_updating_comment_type', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_type_batch' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Use more clear and inclusive language.
+ $blocklist = get_option( 'blacklist_keys', '' );
+ update_option( 'blocklist_keys', $blocklist );
+ delete_option( 'blacklist_keys' );
+
+ $comment_previously_approved = get_option( 'comment_whitelist', '' );
+ update_option( 'comment_previously_approved', $comment_previously_approved );
+ delete_option( 'comment_whitelist' );
</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="trunksrcwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/options-discussion.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked( '1', get_option( 'comment_moderation' ) ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Comment must be manually approved' ); ?> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked( '1', get_option( 'comment_whitelist' ) ); ?> /> <?php _e( 'Comment author must have a previously approved comment' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<label for="comment_previously_approved"><input type="checkbox" name="comment_previously_approved" id="comment_previously_approved" value="1" <?php checked( '1', get_option( 'comment_previously_approved' ) ); ?> /> <?php _e( 'Comment author must have a previously approved comment' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,9 +206,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Comment Blocklist' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Blocklist' ); ?></span></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><label for="blacklist_keys"><?php _e( 'When a comment contains any of these words in its content, author name, URL, email, IP address, or browser’s user agent string, it will be put in the Trash. One word or IP address per line. It will match inside words, so “press” will match “WordPress”.' ); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><label for="blocklist_keys"><?php _e( 'When a comment contains any of these words in its content, author name, URL, email, IP address, or browser’s user agent string, it will be put in the Trash. One word or IP address per line. It will match inside words, so “press” will match “WordPress”.' ); ?></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<textarea name="blocklist_keys" rows="10" cols="50" id="blocklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blocklist_keys' ) ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-admin/options.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$whitelist_options = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$allowed_options = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'general' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogname',
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogdescription',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,10 +100,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'moderation_notify',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_moderation',
</span><span class="cx" style="display: block; padding: 0 10px"> 'require_name_email',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment_whitelist',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment_previously_approved',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_max_links',
</span><span class="cx" style="display: block; padding: 0 10px"> 'moderation_keys',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blacklist_keys',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blocklist_keys',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_avatars',
</span><span class="cx" style="display: block; padding: 0 10px"> 'avatar_rating',
</span><span class="cx" style="display: block; padding: 0 10px"> 'avatar_default',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,36 +146,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'default_post_format',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$whitelist_options['misc'] = array();
-$whitelist_options['options'] = array();
-$whitelist_options['privacy'] = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$allowed_options['misc'] = array();
+$allowed_options['options'] = array();
+$allowed_options['privacy'] = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mail_options = array( 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['reading'][] = 'blog_charset';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['reading'][] = 'blog_charset';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_site_option( 'initial_db_version' ) < 32453 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['writing'][] = 'use_smilies';
- $whitelist_options['writing'][] = 'use_balanceTags';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['writing'][] = 'use_smilies';
+ $allowed_options['writing'][] = 'use_balanceTags';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_SITEURL' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['general'][] = 'siteurl';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['general'][] = 'siteurl';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_HOME' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['general'][] = 'home';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['general'][] = 'home';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['general'][] = 'users_can_register';
- $whitelist_options['general'][] = 'default_role';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['general'][] = 'users_can_register';
+ $allowed_options['general'][] = 'default_role';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['writing'] = array_merge( $whitelist_options['writing'], $mail_options );
- $whitelist_options['writing'][] = 'ping_sites';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['writing'] = array_merge( $allowed_options['writing'], $mail_options );
+ $allowed_options['writing'][] = 'ping_sites';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['media'][] = 'uploads_use_yearmonth_folders';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If upload_url_path is not the default (empty),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,8 +183,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * they can be edited, otherwise they're locked.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['media'][] = 'upload_path';
- $whitelist_options['media'][] = 'upload_url_path';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['media'][] = 'upload_path';
+ $allowed_options['media'][] = 'upload_url_path';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,19 +195,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist_options['writing'] = array_merge( $whitelist_options['writing'], $mail_options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_options['writing'] = array_merge( $allowed_options['writing'], $mail_options );
</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 class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the options whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the allowed options list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.5.0 Use {@see 'allowed_options'} instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $whitelist_options The options whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $allowed_options The allowed options list.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$allowed_options = apply_filters_deprecated( 'whitelist_options', array( $allowed_options ), '5.5.0', 'apply_filters_deprecated', __( 'Please consider writing more inclusive code.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Filters the allowed options list.
+ *
+ * @since 5.5.0
+ *
+ * @param array $allowed_options The allowed options list.
+ */
+$allowed_options = apply_filters( 'allowed_options', $allowed_options );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'update' === $action ) { // We are saving settings sent from a settings page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'options' === $option_page && ! isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
</span><span class="cx" style="display: block; padding: 0 10px"> $unregistered = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,11 +227,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( $option_page . '-options' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $whitelist_options[ $option_page ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $allowed_options[ $option_page ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: The options page name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>Error</strong>: Options page %s not found in the options whitelist.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: Options page %s not found in the allowed options list.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $option_page ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $options = explode( ',', wp_unslash( $_POST['page_options'] ) );
</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">- $options = $whitelist_options[ $option_page ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options = $allowed_options[ $option_page ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'general' === $option_page ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We need to respect post IDs already in the blacklist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We need to respect post IDs already in the exclude list.
</ins><span class="cx" style="display: block; padding: 0 10px"> $post__not_in = $query->get( 'post__not_in' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post__not_in ) ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteenpackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/package.json 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-content/themes/twentynineteen/package.json 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "options": {
</span><span class="cx" style="display: block; padding: 0 10px"> "autoRename": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "autoRenameStrict": false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "blacklist": {},
</del><span class="cx" style="display: block; padding: 0 10px"> "clean": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "greedy": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "processUrls": false,
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentypackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/package.json 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-content/themes/twentytwenty/package.json 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "options": {
</span><span class="cx" style="display: block; padding: 0 10px"> "autoRename": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "autoRenameStrict": false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "blacklist": {},
</del><span class="cx" style="display: block; padding: 0 10px"> "clean": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "greedy": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "processUrls": false,
</span></span></pre></div>
<a id="trunksrcwpincludesRequestsSSLphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Requests/SSL.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Requests/SSL.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/Requests/SSL.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return boolean Does the domain match?
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function match_domain($host, $reference) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if the reference is blacklisted first
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if the reference is blocklisted first
</ins><span class="cx" style="display: block; padding: 0 10px"> if (self::verify_reference_name($reference) !== true) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,4 +149,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1684,7 +1684,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * List of the tag names seen for before_widget strings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This is used in the {@see 'filter_wp_kses_allowed_html'} filter to ensure that the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * data-* attributes can be whitelisted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * data-* attributes can be allowed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpdatequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-date-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-date-query.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/class-wp-date-query.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,10 +462,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Validates a column name parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Column names without a table prefix (like 'post_date') are checked against a whitelist of
- * known tables, and then, if found, have a table prefix (such as 'wp_posts.') prepended.
- * Prefixed column names (such as 'wp_posts.post_date') bypass this whitelist check,
- * and are only sanitized to remove illegal characters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Column names without a table prefix (like 'post_date') are checked against a list of
+ * allowed and known tables, and then, if found, have a table prefix (such as 'wp_posts.')
+ * prepended. Prefixed column names (such as 'wp_posts.post_date') bypass this allowed
+ * check, and are only sanitized to remove illegal characters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorimagickphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-imagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-imagick.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/class-wp-image-editor-imagick.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,8 +305,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Set the filter value if '$filter_name' name is in our whitelist and the related
- * Imagick constant is defined or fall back to our default filter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Set the filter value if '$filter_name' name is in the allowed list and the related
+ * Imagick constant is defined or fall back to the default filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $filter_name, $allowed_filters, true ) && defined( 'Imagick::' . $filter_name ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = constant( 'Imagick::' . $filter_name );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpoembedcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-oembed-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-oembed-controller.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/class-wp-oembed-controller.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'absint',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'discover' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Whether to perform an oEmbed discovery request for non-whitelisted providers.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Whether to perform an oEmbed discovery request for unsanctioned providers.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'boolean',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpoembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-oembed.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/class-wp-oembed.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,10 +131,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$early_providers = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the list of whitelisted oEmbed providers.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the list of sanctioned oEmbed providers.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Since WordPress 4.4, oEmbed discovery is enabled for all users and allows embedding of sanitized
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * iframes. The providers in this list are whitelisted, meaning they are trusted and allowed to
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * iframes. The providers in this list are sanctioned, meaning they are trusted and allowed to
</ins><span class="cx" style="display: block; padding: 0 10px"> * embed any content, such as iframes, videos, JavaScript, and arbitrary HTML.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Supported providers:
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/class-wp.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the query variables whitelist before processing.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the query variables allowed before processing.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Allows (publicly allowed) query vars to be added, removed, or changed prior
</span><span class="cx" style="display: block; padding: 0 10px"> * to executing the query. Needed to allow custom rewrite rules using your own arguments
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string[] $public_query_vars The array of whitelisted query variable names.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string[] $public_query_vars The array of allowed query variable names.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/comment.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,15 +10,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Check whether a comment passes internal checks to be allowed to add.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If manual comment moderation is set in the administration, then all checks,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * regardless of their type and whitelist, will fail and the function will
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * regardless of their type and substance, will fail and the function will
</ins><span class="cx" style="display: block; padding: 0 10px"> * return false.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If the number of links exceeds the amount in the administration, then the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * check fails. If any of the parameter contents match the blacklist of words,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * check fails. If any of the parameter contents contain any disallowed words,
</ins><span class="cx" style="display: block; padding: 0 10px"> * then the check fails.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If the comment author was approved before, then the comment is automatically
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * whitelisted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * approved.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If all checks pass, the function will return true.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * as well as whether there are any moderation keywords (if set) present in the author
</span><span class="cx" style="display: block; padding: 0 10px"> * email address. If both checks pass, return true. Otherwise, return false.
</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 ( 1 == get_option( 'comment_whitelist' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == get_option( 'comment_previously_approved' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'trackback' !== $comment_type && 'pingback' !== $comment_type && '' !== $author && '' !== $email ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_user = get_user_by( 'email', wp_unslash( $email ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $comment_user->ID ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,7 +815,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $approved = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_blacklist_check(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_blocklist_check(
</ins><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author'],
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author_email'],
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author_url'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1262,9 +1262,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Does comment contain blacklisted characters or words.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Checks if a comment contains disallowed characters or words.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 1.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $author The author of the comment
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $email The email of the comment
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1272,13 +1272,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $comment The comment content
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_ip The comment author's IP address
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_agent The author's browser user agent
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True if comment contains blacklisted content, false if comment does not
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True if comment contains disallowed content, false if comment does not
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_blacklist_check( $author, $email, $url, $comment, $user_ip, $user_agent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_blocklist_check( $author, $email, $url, $comment, $user_ip, $user_agent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires before the comment is tested for blacklisted characters or words.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before the comment is tested for disallowed characters or words.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.5.0 Use {@see 'wp_blocklist_check'} instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $author Comment author.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $email Comment author's email.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1287,14 +1288,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_ip Comment author's IP address.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_agent Comment author's browser user agent.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action_deprecated( 'wp_blacklist_check', array( $author, $email, $url, $comment, $user_ip, $user_agent ), '5.5.0', 'wp_blocklist_check', __( 'Please consider writing more inclusive code.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mod_keys = trim( get_option( 'blacklist_keys' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires before the comment is tested for disallowed characters or words.
+ *
+ * @since 5.5.0
+ *
+ * @param string $author Comment author.
+ * @param string $email Comment author's email.
+ * @param string $url Comment author's URL.
+ * @param string $comment Comment content.
+ * @param string $user_ip Comment author's IP address.
+ * @param string $user_agent Comment author's browser user agent.
+ */
+ do_action( 'wp_blocklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
+
+ $mod_keys = trim( get_option( 'blocklist_keys' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $mod_keys ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false; // If moderation keys are empty.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure HTML tags are not being used to bypass the blacklist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure HTML tags are not being used to bypass the list of disallowed characters and words.
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_without_html = wp_strip_all_tags( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $words = explode( "\n", $mod_keys );
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/default-filters.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'post_mime_type', 'sanitize_mime_type' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Meta.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'register_meta_args', '_wp_register_meta_args_whitelist', 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'register_meta_args', '_wp_register_meta_args_allowed_list', 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Post meta.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'added_post_meta', 'wp_cache_set_posts_last_changed' );
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/deprecated.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3995,3 +3995,83 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // register_globals was deprecated in PHP 5.3 and removed entirely in PHP 5.4.
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '5.5.0' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Does comment contain disallowed characters or words.
+ *
+ * @since 1.5.0
+ * @deprecated 5.5.0 Use wp_blocklist_check() instead.
+ * Please consider writing more inclusive code.
+ *
+ * @param string $author The author of the comment
+ * @param string $email The email of the comment
+ * @param string $url The url used in the comment
+ * @param string $comment The comment content
+ * @param string $user_ip The comment author's IP address
+ * @param string $user_agent The author's browser user agent
+ * @return bool True if comment contains disallowed content, false if comment does not
+ */
+function wp_blacklist_check( $author, $email, $url, $comment, $user_ip, $user_agent ) {
+ _deprecated_function( __FUNCTION__, '5.5.0', 'wp_blocklist_check()' );
+
+ return wp_blocklist_check( $author, $email, $url, $comment, $user_ip, $user_agent );
+}
+
+/**
+ * Filters out `register_meta()` args based on an allowed list.
+ *
+ * `register_meta()` args may change over time, so requiring the allowed list
+ * to be explicitly turned off is a warranty seal of sorts.
+ *
+ * @access private
+ * @since 4.6.0
+ * @deprecated 5.5.0 Use _wp_register_meta_args_allowed_list() instead.
+ * Please consider writing more inclusive code.
+ *
+ * @param array $args Arguments from `register_meta()`.
+ * @param array $default_args Default arguments for `register_meta()`.
+ * @return array Filtered arguments.
+ */
+function _wp_register_meta_args_whitelist( $args, $default_args ) {
+ _deprecated_function( __FUNCTION__, '5.5.0', '_wp_register_meta_args_allowed_list()' );
+
+ return _wp_register_meta_args_allowed_list( $args, $default_args );
+}
+
+/**
+ * Adds an array of options to the list of allowed options.
+ *
+ * @since 2.7.0
+ * @deprecated 5.5.0 Use add_option_allowed_list() instead.
+ * Please consider writing more inclusive code.
+ *
+ * @global array $allowed_options
+ *
+ * @param array $new_options
+ * @param string|array $options
+ * @return array
+ */
+function add_option_whitelist( $new_options, $options = '' ) {
+ _deprecated_function( __FUNCTION__, '5.5.0', 'add_option_allowed_list()' );
+
+ return add_option_allowed_list( $new_options, $options );
+}
+
+/**
+ * Removes a list of options from the allowed options list.
+ *
+ * @since 2.7.0
+ * @deprecated 5.5.0 Use remove_option_allowed_list() instead.
+ * Please consider writing more inclusive code.
+ *
+ * @global array $allowed_options
+ *
+ * @param array $del_options
+ * @param string|array $options
+ * @return array
+ */
+function remove_option_whitelist( $del_options, $options = '' ) {
+ _deprecated_function( __FUNCTION__, '5.5.0', 'remove_option_allowed_list()' );
+
+ return remove_option_allowed_list( $del_options, $options );
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/formatting.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2048,7 +2048,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Loop over any intermediate extensions. Postfix them with a trailing underscore
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * if they are a 2 - 5 character long alpha string not in the extension whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * if they are a 2 - 5 character long alpha string not in the allowed extension list.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $parts as $part ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filename .= '.' . $part;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4852,7 +4852,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'moderation_keys':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'blacklist_keys':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'blocklist_keys':
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = $value->get_error_message();
</span></span></pre></div>
<a id="trunksrcwpincludeshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/http.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/http.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whitelists allowed redirect hosts for safe HTTP requests as well.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Mark allowed redirect hosts safe for HTTP requests as well.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Attached to the {@see 'http_request_host_is_external'} filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,7 +611,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whitelists any domain in a multisite installation for safe HTTP requests.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds any domain in a multisite installation for safe HTTP requests to the
+ * allowed list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Attached to the {@see 'http_request_host_is_external'} filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/kses.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1720,13 +1720,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Callback for `wp_kses_bad_protocol_once()` regular expression.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This function processes URL protocols, checks to see if they're in the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * whitelist or not, and returns different data depending on the answer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * list of allowed protocols or not, and returns different data depending
+ * on the answer.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @ignore
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string URI scheme to check against the whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $string URI scheme to check against the list of allowed protocols.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $allowed_protocols Array of allowed URL protocols.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Sanitized content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1772,7 +1773,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Disarm all entities by converting & to &
</span><span class="cx" style="display: block; padding: 0 10px"> $string = str_replace( '&', '&', $string );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Change back the allowed entities in our entity whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Change back the allowed entities in our list of allowed entities.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'xml' === $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $string = preg_replace_callback( '/&([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_xml_named_entities', $string );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1912,7 +1913,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This function decodes numeric HTML entities (`A` and `A`).
</span><span class="cx" style="display: block; padding: 0 10px"> * It doesn't do anything with named entities like `ä`, but we don't
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * need them in the URL protocol whitelisting system anyway.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * need them in the allowed URL protocols system anyway.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/meta.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1396,19 +1396,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters out `register_meta()` args based on a whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters out `register_meta()` args based on an allowed list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * `register_meta()` args may change over time, so requiring the whitelist
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * `register_meta()` args may change over time, so requiring the allowed list
</ins><span class="cx" style="display: block; padding: 0 10px"> * to be explicitly turned off is a warranty seal of sorts.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.6.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Arguments from `register_meta()`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $default_args Default arguments for `register_meta()`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Filtered arguments.
</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 _wp_register_meta_args_whitelist( $args, $default_args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wp_register_meta_args_allowed_list( $args, $default_args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_intersect_key( $args, $default_args );
</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="trunksrcwpincludesmsblogsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/ms-blogs.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,9 +720,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '3.1.0' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pref_whitelist = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_field_names = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $pref, $pref_whitelist, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $pref, $allowed_field_names, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $value;
</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="trunksrcwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-default-filters.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/ms-default-filters.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,5 +124,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Whitelist multisite domains for HTTP requests.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Allow multisite domains for HTTP requests.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'http_request_host_is_external', 'ms_allowed_http_request_hosts', 20, 2 );
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/ms-functions.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,7 +441,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Sanitize and validate data required for a user sign-up.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Verifies the validity and uniqueness of user names and user email addresses,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and checks email addresses against admin-provided domain whitelists and blacklists.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and checks email addresses against allowed and disallowed domains provided by
+ * administrators.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The {@see 'wpmu_validate_user_signup'} hook provides an easy way to modify the sign-up
</span><span class="cx" style="display: block; padding: 0 10px"> * process. The value $result, which is passed to the hook, contains both the user-provided
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1358,7 +1359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_installing( true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_data_whitelist = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_data_fields = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_data = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1366,7 +1367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $path,
</span><span class="cx" style="display: block; padding: 0 10px"> 'network_id' => $network_id,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_intersect_key( $options, array_flip( $site_data_whitelist ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_intersect_key( $options, array_flip( $allowed_data_fields ) )
</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"> // Data to pass to wp_initialize_site().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1373,7 +1374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_initialization_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'options' => array_diff_key( $options, array_flip( $site_data_whitelist ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'options' => array_diff_key( $options, array_flip( $allowed_data_fields ) ),
</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"> $blog_id = wp_insert_site( array_merge( $site_data, $site_initialization_data ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1840,12 +1841,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Check an array of MIME types against a whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Check an array of MIME types against a list of allowed types.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress ships with a set of allowed upload filetypes,
</span><span class="cx" style="display: block; padding: 0 10px"> * which is defined in wp-includes/functions.php in
</span><span class="cx" style="display: block; padding: 0 10px"> * get_allowed_mime_types(). This function is used to filter
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * that list against the filetype whitelist provided by Multisite
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * that list against the filetypes allowed provided by Multisite
</ins><span class="cx" style="display: block; padding: 0 10px"> * Super Admins at wp-admin/network/settings.php.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span></span></pre></div>
<a id="trunksrcwpincludesmssitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-site.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/ms-site.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,10 +114,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['WPLANG'] = get_network_option( $new_site->network_id, 'WPLANG' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Rebuild the data expected by the `wpmu_new_blog` hook prior to 5.1.0 using whitelisted keys.
- // The `$site_data_whitelist` matches the one used in `wpmu_create_blog()`.
- $site_data_whitelist = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
- $meta = array_merge( array_intersect_key( $data, array_flip( $site_data_whitelist ) ), $meta );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Rebuild the data expected by the `wpmu_new_blog` hook prior to 5.1.0 using allowed keys.
+ // The `$allowed_data_fields` matches the one used in `wpmu_create_blog()`.
+ $allowed_data_fields = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
+ $meta = array_merge( array_intersect_key( $data, array_flip( $allowed_data_fields ) ), $meta );
</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"> * Fires immediately after a new site is created.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,8 +492,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $data = apply_filters( 'wp_normalize_site_data', $data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist = array( 'domain', 'path', 'network_id', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
- $data = array_intersect_key( wp_parse_args( $data, $defaults ), array_flip( $whitelist ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_data_fields = array( 'domain', 'path', 'network_id', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
+ $data = array_intersect_key( wp_parse_args( $data, $defaults ), array_flip( $allowed_data_fields ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/option.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2097,8 +2097,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $new_whitelist_options
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_registered_settings
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
- * Default whitelisted option key names include 'general', 'discussion', 'media',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $option_group A settings group name. Should correspond to an allowed option key name.
+ * Default allowed option key names include 'general', 'discussion', 'media',
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'reading', 'writing', 'misc', 'options', and 'privacy'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_name The name of an option to sanitize and save.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/pluggable.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1466,7 +1466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpp = parse_url( home_url() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the whitelist of hosts to redirect to.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the list of allowed hosts to redirect to.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiclasswprestserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/class-wp-rest-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-server.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/rest-api/class-wp-rest-server.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $embedded = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data['_links'] as $rel => $links ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If a list of relations was specified, and the link relation is not in the whitelist, don't process the link.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If a list of relations was specified, and the link relation is not in the list of allowed relations, don't process the link.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $embed ) && ! in_array( $rel, $embed, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestsettingscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,7 +251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whitelist the supported types for settings, as we don't want invalid types
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allow the supported types for settings, as we don't want invalid types
</ins><span class="cx" style="display: block; padding: 0 10px"> * to be updated with arbitrary values that we can't do decent sanitizing for.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $rest_args['schema']['type'], array( 'number', 'integer', 'string', 'boolean', 'array', 'object' ), true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * By default, the schema of settings will throw an error if a value is set to
</span><span class="cx" style="display: block; padding: 0 10px"> * `null` as it's not a valid value for something like "type => string". We
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * provide a wrapper sanitizer to whitelist the use of `null`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * provide a wrapper sanitizer to allow the use of `null`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/script-loader.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,7 +1064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'wp-deprecated', 'zxcvbn-async' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><span class="cx" style="display: block; padding: 0 10px"> 'password-strength-meter',
</span><span class="cx" style="display: block; padding: 0 10px"> 'pwsL10n',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1077,6 +1077,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'mismatch' => _x( 'Mismatch', 'password mismatch' ),
</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">+ $scripts->set_translations( 'password-strength-meter' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCoreEd25519php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/sodium_compat/src/Core/Ed25519.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/src/Core/Ed25519.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/sodium_compat/src/Core/Ed25519.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,8 +376,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function small_order($R)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var array<int, array<int, int>> $blacklist */
- $blacklist = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var array<int, array<int, int>> $blocklist */
+ $blocklist = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* 0 (order 4) */
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,13 +463,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var int $countBlacklist */
- $countBlacklist = count($blacklist);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var int $countBlocklist */
+ $countBlocklist = count($blocklist);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ($i = 0; $i < $countBlacklist; ++$i) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ($i = 0; $i < $countBlocklist; ++$i) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $c = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> for ($j = 0; $j < 32; ++$j) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c |= self::chrToInt($R[$j]) ^ (int) $blacklist[$i][$j];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c |= self::chrToInt($R[$j]) ^ (int) $blocklist[$i][$j];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ($c === 0) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCore32Ed25519php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/sodium_compat/src/Core32/Ed25519.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/src/Core32/Ed25519.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/sodium_compat/src/Core32/Ed25519.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function small_order($R)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static $blacklist = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $blocklist = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* 0 (order 4) */
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,13 +464,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var array<int, array<int, int>> $blacklist */
- $countBlacklist = count($blacklist);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var array<int, array<int, int>> $blocklist */
+ $countBlocklist = count($blocklist);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ($i = 0; $i < $countBlacklist; ++$i) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ($i = 0; $i < $countBlocklist; ++$i) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $c = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> for ($j = 0; $j < 32; ++$j) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c |= self::chrToInt($R[$j]) ^ $blocklist[$i][$j];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ($c === 0) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/theme.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2823,7 +2823,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|void Whether feature was removed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_theme_support( $feature ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Blacklist: for internal registrations not used directly by themes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not remove internal registrations that are not used directly by themes.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2832,11 +2832,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Do not use. Removes theme support internally, ignorant of the blacklist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Do not use. Removes theme support internally without knowledge of those not used by
+ * themes directly.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @global array $_wp_theme_features
</span><span class="cx" style="display: block; padding: 0 10px"> * @global Custom_Image_Header $custom_image_header
</span><span class="cx" style="display: block; padding: 0 10px"> * @global Custom_Background $custom_background
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/user.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1593,11 +1593,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the list of blacklisted usernames.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the list of disallowed usernames.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $usernames Array of blacklisted usernames.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $usernames Array of disallowed usernames.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/version.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/version.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/version.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $wp_db_version
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wp_db_version = 48072;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wp_db_version = 48121;
</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"> * Holds the TinyMCE version.
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/src/wp-includes/widgets.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1282,7 +1282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Compares a list of sidebars with their widgets against a whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Compares a list of sidebars with their widgets against an allowed list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.2 Always tries to restore widget assignments from previous data, not just if sidebars needed mapping.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1457,22 +1457,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Compares a list of sidebars with their widgets against a whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Compares a list of sidebars with their widgets against an allowed list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $sidebars_widgets List of sidebars and their widget instance IDs.
- * @param array $whitelist Optional. List of widget IDs to compare against. Default: Registered widgets.
- * @return array Sidebars with whitelisted widgets.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $sidebars_widgets List of sidebars and their widget instance IDs.
+ * @param array $allowed_widget_ids Optional. List of widget IDs to compare against. Default: Registered widgets.
+ * @return array Sidebars with allowed widgets.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wp_remove_unregistered_widgets( $sidebars_widgets, $whitelist = array() ) {
- if ( empty( $whitelist ) ) {
- $whitelist = array_keys( $GLOBALS['wp_registered_widgets'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wp_remove_unregistered_widgets( $sidebars_widgets, $allowed_widget_ids = array() ) {
+ if ( empty( $allowed_widget_ids ) ) {
+ $allowed_widget_ids = array_keys( $GLOBALS['wp_registered_widgets'] );
</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"> foreach ( $sidebars_widgets as $sidebar => $widgets ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $widgets ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sidebars_widgets[ $sidebar ] = array_intersect( $widgets, $whitelist );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sidebars_widgets[ $sidebar ] = array_intersect( $widgets, $allowed_widget_ids );
</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="trunktestsphpunitincludesfactoryclasswpunittestfactoryforblogphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,12 +40,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['meta'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The `$site_data_whitelist` matches the one used in `wpmu_create_blog()`.
- $site_data_whitelist = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The `$allowed_data_fields` matches the one used in `wpmu_create_blog()`.
+ $allowed_data_fields = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args['meta'] as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Promote whitelisted keys to top-level arguments, add others to the options array.
- if ( in_array( $key, $site_data_whitelist, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Promote allowed keys to top-level arguments, add others to the options array.
+ if ( in_array( $key, $allowed_data_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args[ $key ] = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['options'][ $key ] = $value;
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesSchemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesSchema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesSchema.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/admin/includesSchema.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'use_quicktags' => '1',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This option is on a blacklist and should never exist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This option disallowed and should never exist.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'use_quicktags' => false,
</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="trunktestsphpunittestscommentcheckCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/checkComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/checkComment.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/comment/checkComment.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group comment
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Comment_CheckComment extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_true_when_comment_whitelist_is_disabled() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_comment_previously_approved_is_disabled() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = 'BobtheBuilder';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'bob@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_url = 'http://example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,12 +13,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_type = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $results = check_comment( $author, $author_email, $author_url, $comment, $author_ip, $user_agent, $comment_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $results );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_false_when_comment_whitelist_is_enabled_and_author_does_not_have_approved_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_false_when_comment_previously_approved_is_enabled_and_author_does_not_have_approved_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = 'BobtheBuilder';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'bob@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_url = 'http://example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,13 +27,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_type = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $results = check_comment( $author, $author_email, $author_url, $comment, $author_ip, $user_agent, $comment_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_true_when_comment_whitelist_is_enabled_and_author_has_approved_comment() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_comment_previously_approved_is_enabled_and_author_has_approved_comment() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $post_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_comment_id = self::factory()->comment->create( $prev_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = 'BobtheBuilder';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'bob@example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_false_when_content_matches_moderation_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = 'WendytheBuilder';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'wendy@example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_true_when_content_does_not_match_moderation_keys() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = 'WendytheBuilder';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'wendy@example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_false_when_link_count_exceeds_comment_max_length_setting() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = 'BobtheBuilder';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'bob@example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_true_when_link_count_does_not_exceed_comment_max_length_setting() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = 'BobtheBuilder';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'bob@example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28603
</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 function test_should_return_true_when_comment_whitelist_is_enabled_and_user_has_previously_approved_comments_with_different_email() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_comment_previously_approved_is_enabled_and_user_has_previously_approved_comments_with_different_email() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber_id = $this->factory()->user->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_user( $subscriber_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = check_comment( 'foo', 'newsub@example.com', 'http://example.com', 'This is a comment.', '66.155.40.249', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:35.0) Gecko/20100101 Firefox/35.0', 'comment', 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $results );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28603
</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 function test_should_return_false_when_comment_whitelist_is_enabled_and_user_does_not_have_a_previously_approved_comment_with_any_email() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_false_when_comment_previously_approved_is_enabled_and_user_does_not_have_a_previously_approved_comment_with_any_email() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber_id = $this->factory()->user->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_user( $subscriber_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = check_comment( 'bar', 'zag@example.com', 'http://example.com', 'This is my first comment.', '66.155.40.249', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:35.0) Gecko/20100101 Firefox/35.0', 'comment', 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $results );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpAllowCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/wpAllowComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpAllowComment.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/comment/wpAllowComment.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 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"> function tearDown() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( self::$post_id, true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_comment( self::$comment_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_whitelist', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'comment_previously_approved', 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"> public function test_allow_comment_if_comment_author_emails_differ() {
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpBlacklistCheckphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,9 +3,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group comment
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class Tests_WP_Blacklist_Check extends WP_UnitTestCase {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Tests_WP_Blocklist_Check extends WP_UnitTestCase {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_true_when_content_matches_blacklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_content_matches_blocklist_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = 'Sting';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'sting@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_url = 'http://example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,9 +13,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip = '192.168.0.1';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'blacklist_keys', "well\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'blocklist_keys', "well\nfoo" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_blocklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37208
</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 function test_should_return_true_when_content_with_html_matches_blacklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_content_with_html_matches_blocklist_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = 'Sting';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'sting@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_url = 'http://example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,14 +31,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip = '192.168.0.1';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'blacklist_keys', "halfway\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'blocklist_keys', "halfway\nfoo" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_blocklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_true_when_author_matches_blacklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_author_matches_blocklist_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = 'Sideshow Mel';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'mel@example.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_url = 'http://example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,14 +46,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip = '192.168.0.1';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'blacklist_keys', "sideshow\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'blocklist_keys', "sideshow\nfoo" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_blocklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_true_when_url_matches_blacklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_url_matches_blocklist_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = 'Rainier Wolfcastle';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'rainier@wolfcastle.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_url = 'http://example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,9 +61,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip = '192.168.0.1';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'blacklist_keys', "example\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'blocklist_keys', "example\nfoo" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_blocklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37208
</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 function test_should_return_true_when_link_matches_blacklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_link_matches_blocklist_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = 'Rainier Wolfcastle';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'rainier@wolfcastle.com';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_url = 'http://example.com';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,9 +79,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip = '192.168.0.1';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'blacklist_keys', '/spam/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'blocklist_keys', '/spam/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_blocklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,9 +94,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip = '192.168.0.1';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'blacklist_keys', "sideshow\nfoobar" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'blocklist_keys', "sideshow\nfoobar" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_blocklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/media.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1473,7 +1473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow the sizes that should be included so we pick up 'medium_large' in 4.4.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $name, $intermediates, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir_url . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1518,7 +1518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow the sizes that should be included so we pick up 'medium_large' in 4.4.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $name, $intermediates, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir_url . $size['file'] . ' ' . $size['width'] . 'w, ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1595,7 +1595,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow the sizes that should be included so we pick up 'medium_large' in 4.4.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $name, $intermediates, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir_url . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1874,7 +1874,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $image_meta['sizes'] as $name => $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow the sizes that should be included so we pick up 'medium_large' in 4.4.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $name, $intermediates, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= $uploads_dir . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/multisite/site.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2461,7 +2461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_wpmu_new_blog_action_backward_commpatible() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'default values' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'default values' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => 0, // `public` is one of the default metas in `wpmu_create_blog()' function prior to WordPress 5.1.0.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2468,7 +2468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'WPLANG' => 'en_US', // WPLANG is another default meta in `wpmu_create_blog()` function prior to WordPress 5.1.0.
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'public site' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'public site' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2477,7 +2477,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'WPLANG' => 'en_US',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'all whitelisted' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'allowed_keys' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => -1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'archived' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2497,7 +2497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'lang_id' => 11,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'extra meta key' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'extra meta key' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo' => 'bar',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesiteDetailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/siteDetails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/siteDetails.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/multisite/siteDetails.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,101 +9,101 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_Site_Details extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_whitelisted_options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_allowed_options
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40063
</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 function test_update_whitelisted_option_deletes_site_details_cache( $whitelisted_option, $temporary_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_allowed_option_deletes_site_details_cache( $allowed_option, $temporary_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $site = get_site();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_value = $site->$whitelisted_option;
- update_option( $whitelisted_option, $temporary_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_value = $site->$allowed_option;
+ update_option( $allowed_option, $temporary_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_result = wp_cache_get( $site->id, 'site-details' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Reset to original value. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( $whitelisted_option, $original_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( $allowed_option, $original_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $cached_result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_whitelisted_options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_allowed_options
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40063
</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 function test_update_whitelisted_option_deletes_blog_details_cache( $whitelisted_option, $temporary_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_allowed_option_deletes_blog_details_cache( $allowed_option, $temporary_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_details = get_blog_details();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_value = $blog_details->$whitelisted_option;
- update_option( $whitelisted_option, $temporary_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_value = $blog_details->$allowed_option;
+ update_option( $allowed_option, $temporary_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_result = wp_cache_get( $blog_details->id, 'blog-details' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Reset to original value. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( $whitelisted_option, $original_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( $allowed_option, $original_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $cached_result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_whitelisted_options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_allowed_options
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40063
</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 function test_update_whitelisted_option_does_not_delete_site_cache( $whitelisted_option, $temporary_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_allowed_option_does_not_delete_site_cache( $allowed_option, $temporary_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $site = get_site();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_value = $site->$whitelisted_option;
- update_option( $whitelisted_option, $temporary_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_value = $site->$allowed_option;
+ update_option( $allowed_option, $temporary_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_result = wp_cache_get( $site->id, 'sites' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Reset to original value. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( $whitelisted_option, $original_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( $allowed_option, $original_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( $cached_result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_whitelisted_options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_allowed_options
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40063
</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 function test_update_whitelisted_option_does_not_delete_short_blog_details_cache( $whitelisted_option, $temporary_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_allowed_option_does_not_delete_short_blog_details_cache( $allowed_option, $temporary_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_details = get_blog_details( null, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_value = get_option( $whitelisted_option );
- update_option( $whitelisted_option, $temporary_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_value = get_option( $allowed_option );
+ update_option( $allowed_option, $temporary_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_result = wp_cache_get( $blog_details->id . 'short', 'blog-details' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Reset to original value. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( $whitelisted_option, $original_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( $allowed_option, $original_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotFalse( $cached_result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_whitelisted_options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_allowed_options
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40063
</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 function test_update_whitelisted_option_does_not_update_sites_last_changed( $whitelisted_option, $temporary_value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_update_allowed_option_does_not_update_sites_last_changed( $allowed_option, $temporary_value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_changed = wp_cache_get_last_changed( '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">- $original_value = get_option( $whitelisted_option );
- update_option( $whitelisted_option, $temporary_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_value = get_option( $allowed_option );
+ update_option( $allowed_option, $temporary_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $new_last_changed = wp_cache_get_last_changed( 'sites' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Reset to original value. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( $whitelisted_option, $original_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( $allowed_option, $original_value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $new_last_changed, $last_changed );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function data_whitelisted_options() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_allowed_options() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'blogname', 'Custom Site' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'home', 'http://custom-site-url.org' ),
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitewpmuValidateUserSignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'is_email', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_fail_for_emails_from_non_whitelisted_domains() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_fail_for_emails_from_disallowed_domains() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $domains = array( 'foo.com', 'bar.org' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'limited_email_domains', $domains );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'user_email', $v['errors']->get_error_codes() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_not_fail_for_emails_from_whitelisted_domains_with_mixed_case() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_not_fail_for_emails_from_allowed_domains_with_mixed_case() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $domains = array( 'foo.com', 'bar.org' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'limited_email_domains', $domains );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostattachmentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/attachments.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/post/attachments.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_attachment_is_default() {
</span><span class="cx" style="display: block; padding: 0 10px"> // On Multisite, psd is not an allowed mime type by default.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_mimes', array( $this, 'whitelist_psd_mime_type' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'upload_mimes', array( $this, 'allow_psd_mime_type' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = DIR_TESTDATA . '/images/test-image.psd';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,7 +481,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_attachment_is( 'video', $attachment_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'upload_mimes', array( $this, 'whitelist_psd_mime_type' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'upload_mimes', array( $this, 'allow_psd_mime_type' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,21 +493,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $upload['error'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_mimes', array( $this, 'blacklist_jpg_mime_type' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'upload_mimes', array( $this, 'disallow_jpg_mime_type' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'upload_mimes', array( $this, 'blacklist_jpg_mime_type' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'upload_mimes', array( $this, 'disallow_jpg_mime_type' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $upload['error'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function whitelist_psd_mime_type( $mimes ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function allow_psd_mime_type( $mimes ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mimes['psd'] = 'application/octet-stream';
</span><span class="cx" style="display: block; padding: 0 10px"> return $mimes;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function blacklist_jpg_mime_type( $mimes ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function disallow_jpg_mime_type( $mimes ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $mimes['jpg|jpeg|jpe'] );
</span><span class="cx" style="display: block; padding: 0 10px"> return $mimes;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpUniquePostSlugphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,9 +128,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider whitelist_post_statuses
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider allowed_post_statuses
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_whitelisted_post_statuses_should_not_be_forced_to_be_unique( $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_allowed_post_statuses_should_not_be_forced_to_be_unique( $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p1 = self::factory()->post->create(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function whitelist_post_statuses() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function allowed_post_statuses() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'draft' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'pending' ),
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/rest-api.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Ensure that result fields are not whitelisted if no request['_fields'] is present.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensure that result fields are not allowed if no request['_fields'] is present.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_filter_response_fields_no_request_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $response = new WP_REST_Response();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +390,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Ensure that result fields are whitelisted if request['_fields'] is present.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensure that result fields are allowed if request['_fields'] is present.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_filter_response_fields_single_field_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $response = new WP_REST_Response();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,7 +410,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Ensure that multiple comma-separated fields may be whitelisted with request['_fields'].
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensure that multiple comma-separated fields may be allowed with request['_fields'].
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_filter_response_fields_multi_field_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $response = new WP_REST_Response();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Ensure that multiple comma-separated fields may be whitelisted
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensure that multiple comma-separated fields may be allowed
</ins><span class="cx" style="display: block; padding: 0 10px"> * with request['_fields'] using query parameter array syntax.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_filter_response_fields_multi_field_filter_array() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Ensure that request['_fields'] whitelists apply to items in response collections.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensure that request['_fields'] allowed list apply to items in response collections.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_filter_response_fields_numeric_array() {
</span><span class="cx" style="display: block; padding: 0 10px"> $response = new WP_REST_Response();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Ensure that nested fields may be whitelisted with request['_fields'].
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensure that nested fields may be allowed with request['_fields'].
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42094
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetstextwidgetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/text-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/text-widget.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/widgets/text-widget.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,7 +602,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy when not-wpautop and there is HTML that is not liable to be mutated.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check text examples that will migrate to TinyMCE, where elements and attributes are not in whitelist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check text examples that will migrate to TinyMCE, where elements and attributes are not in the allowed list.
</ins><span class="cx" style="display: block; padding: 0 10px"> $migratable_text_examples = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Check out <a href="http://example.com">Example</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<img src="http://example.com/img.jpg" alt="Img">',
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets.php 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/phpunit/tests/widgets.php 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,9 +1054,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'array_version' => 3,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist = array( 'tag_cloud-1', 'text-1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_widgets = array( 'tag_cloud-1', 'text-1' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filtered_widgets = _wp_remove_unregistered_widgets( $widgets, $whitelist );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filtered_widgets = _wp_remove_unregistered_widgets( $widgets, $allowed_widgets );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $filtered_widgets );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'fantasy', $filtered_widgets );
</span></span></pre></div>
<a id="trunktestsqunitfixtureswpapigeneratedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/wp-api-generated.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/wp-api-generated.js 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/qunit/fixtures/wp-api-generated.js 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "discover": {
</span><span class="cx" style="display: block; padding: 0 10px"> "required": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "default": true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Whether to perform an oEmbed discovery request for non-whitelisted providers.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "Whether to perform an oEmbed discovery request for unsanctioned providers.",
</ins><span class="cx" style="display: block; padding: 0 10px"> "type": "boolean"
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4702,7 +4702,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "discover": {
</span><span class="cx" style="display: block; padding: 0 10px"> "required": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "default": true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Whether to perform an oEmbed discovery request for non-whitelisted providers.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "Whether to perform an oEmbed discovery request for unsanctioned providers.",
</ins><span class="cx" style="display: block; padding: 0 10px"> "type": "boolean"
</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="trunktestsqunitwpadminjspasswordstrengthmeterjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/password-strength-meter.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/password-strength-meter.js 2020-06-22 15:28:09 UTC (rev 48120)
+++ trunk/tests/qunit/wp-admin/js/password-strength-meter.js 2020-06-22 17:24:34 UTC (rev 48121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,23 +80,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- QUnit.test( 'blacklisted words in password should be penalized', function( assert ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ QUnit.test( 'disallowed words in password should be penalized', function( assert ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var allowedPasswordScore, penalizedPasswordScore,
</span><span class="cx" style="display: block; padding: 0 10px"> allowedPassword = 'a[janedoefoe]4',
</span><span class="cx" style="display: block; padding: 0 10px"> penalizedPassword = 'a[johndoefoe]4',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- blacklist = [ 'extra', 'johndoefoe', 'superfluous' ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ disallowedList = [ 'extra', 'johndoefoe', 'superfluous' ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- allowedPasswordScore = passwordStrength( allowedPassword, blacklist, allowedPassword );
- penalizedPasswordScore = passwordStrength( penalizedPassword, blacklist, penalizedPassword );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ allowedPasswordScore = passwordStrength( allowedPassword, disallowedList, allowedPassword );
+ penalizedPasswordScore = passwordStrength( penalizedPassword, disallowedList, penalizedPassword );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> assert.ok( penalizedPasswordScore < allowedPasswordScore, 'Penalized password scored ' + penalizedPasswordScore + '; allowed password scored: ' + allowedPasswordScore );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- QUnit.test( 'user input blacklist array should contain expected words', function( assert ) {
- var blacklist = wp.passwordStrength.userInputBlacklist();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ QUnit.test( 'user input disallowed list array should contain expected words', function( assert ) {
+ var disallowedList = wp.passwordStrength.userInputDisallowedList();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert.ok( jQuery.isArray( blacklist ), 'blacklist is an array' );
- assert.ok( jQuery.inArray( 'WordPress', blacklist ) > -1, 'blacklist contains "WordPress" from page title' );
- assert.ok( jQuery.inArray( 'tests', blacklist ) > -1, 'blacklist contains "tests" from site URL' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert.ok( jQuery.isArray( disallowedList ), 'disallowed list is an array' );
+ assert.ok( jQuery.inArray( 'WordPress', disallowedList ) > -1, 'disallowed list contains "WordPress" from page title' );
+ assert.ok( jQuery.inArray( 'tests', disallowedList ) > -1, 'disallowed list contains "tests" from site URL' );
</ins><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>