<!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>[48575] trunk: General: Update code for readability and inclusion</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/48575">48575</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/48575","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-23 03:12:49 +0000 (Thu, 23 Jul 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: Update code for readability and inclusion
There are two pieces in here:
1) The update to change blacklist to blocklist is moved to disallowed_list. "Block" has a meaning in our code, and there could be ambiguity between this code and code related to blocks.
2) This improves backwards compatibility for code that was accessing the now deprecated code.
Previously: <a href="https://core.trac.wordpress.org/changeset/48477">[48477]</a>, <a href="https://core.trac.wordpress.org/changeset/48405">[48405]</a>, <a href="https://core.trac.wordpress.org/changeset/48400">[48400]</a>, <a href="https://core.trac.wordpress.org/changeset/48121">[48121]</a>, <a href="https://core.trac.wordpress.org/changeset/48122">[48122]</a>, <a href="https://core.trac.wordpress.org/changeset/48124">[48124]</a>, <a href="https://core.trac.wordpress.org/changeset/48142">[48142]</a>, <a href="https://core.trac.wordpress.org/changeset/48566">[48566]</a>
Props: desrosj, SergeyBiryukov, johnjamesjacoby
Fixes: <a href="https://core.trac.wordpress.org/ticket/50413">#50413</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.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="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpBlacklistCheckphp">trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-admin/includes/schema.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,7 +532,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin_email_lifespan' => ( time() + 6 * MONTH_IN_SECONDS ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 5.5.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blocklist_keys' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'disallowed_keys' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_previously_approved' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'auto_plugin_theme_update_emails' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +556,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fat_options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'moderation_keys',
</span><span class="cx" style="display: block; padding: 0 10px"> 'recently_edited',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blocklist_keys',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'disallowed_keys',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'uninstall_plugins',
</span><span class="cx" style="display: block; padding: 0 10px"> 'auto_plugin_theme_update_emails',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2177,15 +2177,23 @@
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; 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' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $comment_previously_approved = get_option( 'comment_whitelist', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comment_previously_approved', $comment_previously_approved );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'comment_whitelist' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $wp_current_db_version < 48572 ) {
+ // Use more clear and inclusive language.
+ $disallowed_list = get_option( 'blacklist_keys' );
+
+ if ( false === $disallowed_list ) {
+ $disallowed_list = get_option( 'blocklist_keys' );
+ }
+
+ update_option( 'disallowed_keys', $disallowed_list );
+ delete_option( 'blacklist_keys' );
+ delete_option( 'blocklist_keys' );
+ }
</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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-admin/options-discussion.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,11 +204,11 @@
</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 class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<th scope="row"><?php _e( 'Comment Blocklist' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Blocklist' ); ?></span></legend>
-<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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<th scope="row"><?php _e( 'Disallowed Comment Keys' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Disallowed Comment Keys' ); ?></span></legend>
+<p><label for="disallowed_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="blocklist_keys" rows="10" cols="50" id="blocklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blocklist_keys' ) ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<textarea name="disallowed_keys" rows="10" cols="50" id="disallowed_keys" class="large-text code"><?php echo esc_textarea( get_option( 'disallowed_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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-admin/options.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_previously_approved',
</span><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">- 'blocklist_keys',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'disallowed_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></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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-includes/comment.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -820,7 +820,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_blocklist_check(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_check_comment_disallowed_list(
</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">@@ -1320,12 +1320,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_agent The author's browser user agent
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if comment contains disallowed content, false if comment does not
</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_blocklist_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_check_comment_disallowed_list( $author, $email, $url, $comment, $user_ip, $user_agent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before the comment is tested for disallowed characters or words.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @deprecated 5.5.0 Use {@see 'wp_blocklist_check'} instead.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.5.0 Use {@see 'wp_check_comment_disallowed_list'} 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">@@ -1338,7 +1338,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_blacklist_check',
</span><span class="cx" style="display: block; padding: 0 10px"> array( $author, $email, $url, $comment, $user_ip, $user_agent ),
</span><span class="cx" style="display: block; padding: 0 10px"> '5.5.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_blocklist_check',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_check_comment_disallowed_list',
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Please consider writing more inclusive 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">@@ -1354,9 +1354,9 @@
</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_blocklist_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( 'wp_check_comment_disallowed_list', $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">- $mod_keys = trim( get_option( 'blocklist_keys' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mod_keys = trim( get_option( 'disallowed_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></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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-includes/deprecated.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4025,7 +4025,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Does comment contain disallowed characters or words.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @deprecated 5.5.0 Use wp_blocklist_check() instead.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.5.0 Use wp_check_comment_disallowed_list() instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Please consider writing more inclusive code.
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4037,9 +4037,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if comment contains disallowed content, false if comment does not
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_blacklist_check( $author, $email, $url, $comment, $user_ip, $user_agent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_function( __FUNCTION__, '5.5.0', 'wp_blocklist_check()' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_function( __FUNCTION__, '5.5.0', 'wp_check_comment_disallowed_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">- return wp_blocklist_check( $author, $email, $url, $comment, $user_ip, $user_agent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_check_comment_disallowed_list( $author, $email, $url, $comment, $user_ip, $user_agent );
</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="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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-includes/formatting.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4859,7 +4859,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 'blocklist_keys':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'disallowed_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="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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/src/wp-includes/option.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +35,29 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Until a proper _deprecated_option() function can be introduced,
+ * redirect requests to deprecated keys to the new, correct ones.
+ */
+ $deprecated_keys = array(
+ 'blacklist_keys' => 'disallowed_keys',
+ 'comment_whitelist' => 'comment_previously_approved',
+ );
+
+ if ( ! wp_installing() && isset( $deprecated_keys[ $option ] ) ) {
+ _deprecated_argument(
+ __FUNCTION__,
+ '5.5.0',
+ sprintf(
+ /* translators: 1: Deprecated option key, 2: New option key. */
+ __( 'The "%1$s" option key has been renamed to "%2$s".' ),
+ $option,
+ $deprecated_keys[ $option ]
+ )
+ );
+ return get_option( $deprecated_keys[ $option ], $default );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the value of an existing option before it is retrieved.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,6 +336,29 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Until a proper _deprecated_option() function can be introduced,
+ * redirect requests to deprecated keys to the new, correct ones.
+ */
+ $deprecated_keys = array(
+ 'blacklist_keys' => 'disallowed_keys',
+ 'comment_whitelist' => 'comment_previously_approved',
+ );
+
+ if ( ! wp_installing() && isset( $deprecated_keys[ $option ] ) ) {
+ _deprecated_argument(
+ __FUNCTION__,
+ '5.5.0',
+ sprintf(
+ /* translators: 1: Deprecated option key, 2: New option key. */
+ __( 'The "%1$s" option key has been renamed to "%2$s".' ),
+ $option,
+ $deprecated_keys[ $option ]
+ )
+ );
+ return update_option( $deprecated_keys[ $option ], $value, $autoload );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_protect_special_option( $option );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $value ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,6 +523,29 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Until a proper _deprecated_option() function can be introduced,
+ * redirect requests to deprecated keys to the new, correct ones.
+ */
+ $deprecated_keys = array(
+ 'blacklist_keys' => 'disallowed_keys',
+ 'comment_whitelist' => 'comment_previously_approved',
+ );
+
+ if ( ! wp_installing() && isset( $deprecated_keys[ $option ] ) ) {
+ _deprecated_argument(
+ __FUNCTION__,
+ '5.5.0',
+ sprintf(
+ /* translators: 1: Deprecated option key, 2: New option key. */
+ __( 'The "%1$s" option key has been renamed to "%2$s".' ),
+ $option,
+ $deprecated_keys[ $option ]
+ )
+ );
+ return add_option( $deprecated_keys[ $option ], $value, $deprecated, $autoload );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_protect_special_option( $option );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $value ) ) {
</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-07-23 00:50:57 UTC (rev 48574)
+++ trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php 2020-07-23 03:12:49 UTC (rev 48575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_WP_Blocklist_Check 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">- public function test_should_return_true_when_content_matches_blocklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_content_matches_disallowed_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( 'blocklist_keys', "well\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'disallowed_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_blocklist_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_check_comment_disallowed_list( $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_blocklist_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_disallowed_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( 'blocklist_keys', "halfway\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'disallowed_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_blocklist_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_check_comment_disallowed_list( $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_blocklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_author_matches_disallowed_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( 'blocklist_keys', "sideshow\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'disallowed_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_blocklist_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_check_comment_disallowed_list( $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_blocklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_url_matches_disallowed_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( 'blocklist_keys', "example\nfoo" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'disallowed_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_blocklist_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_check_comment_disallowed_list( $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_blocklist_keys() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_true_when_link_matches_disallowed_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( 'blocklist_keys', '/spam/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'disallowed_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_blocklist_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_check_comment_disallowed_list( $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( 'blocklist_keys', "sideshow\nfoobar" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'disallowed_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_blocklist_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_check_comment_disallowed_list( $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>
</div>
</body>
</html>