<!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>[47156] trunk: Accessibility: Text Changes: Use sentence case for the word `Error` in various error messages, instead of all caps.</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/47156">47156</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/47156","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-02-01 21:36:44 +0000 (Sat, 01 Feb 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'>Accessibility: Text Changes: Use sentence case for the word `Error` in various error messages, instead of all caps.
Using all caps should be avoided for better readability and because screen readers may pronounce all-caps words as abbreviations.
Props afercia, ryokuhi, sabernhardt, garrett-eclipse.
See <a href="https://core.trac.wordpress.org/ticket/47656">#47656</a>, <a href="https://core.trac.wordpress.org/ticket/43037">#43037</a>, <a href="https://core.trac.wordpress.org/ticket/42945">#42945</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesvendortinymcelangswplangsenjs">trunk/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunitincludestracphp">trunk/tests/phpunit/includes/trac.php</a></li>
<li><a href="#trunktestsphpunittestsajaxReplytoCommentphp">trunk/tests/phpunit/tests/ajax/ReplytoComment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesvendortinymcelangswplangsenjs"></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/vendor/tinymce/langs/wp-langs-en.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clipboard_msg: "Copy/Cut/Paste is not available in Mozilla and Firefox.",
</span><span class="cx" style="display: block; padding: 0 10px"> clipboard_no_support: "Currently not supported by your browser, use keyboard shortcuts instead.",
</span><span class="cx" style="display: block; padding: 0 10px"> popup_blocked: "Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- invalid_data: "ERROR: Invalid values entered, these are marked in red.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ invalid_data: "Error: Invalid values entered, these are marked in red.",
</ins><span class="cx" style="display: block; padding: 0 10px"> invalid_data_number: "{#field} must be a number",
</span><span class="cx" style="display: block; padding: 0 10px"> invalid_data_min: "{#field} must be a number greater than {#min}",
</span><span class="cx" style="display: block; padding: 0 10px"> invalid_data_size: "{#field} must be a number or percentage",
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></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/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/import.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php echo esc_html( $title ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><strong><?php _e( 'ERROR:' ); ?></strong>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><strong><?php _e( 'Error:' ); ?></strong>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Importer slug. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1272,7 +1272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post->post_status ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'ERROR: You are replying to a comment on a draft post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Error: You are replying to a comment on a draft post.' ) );
</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"> $user = wp_get_current_user();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1302,7 +1302,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"> if ( '' == $comment_content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'ERROR: Please type a comment.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Error: Please type a comment.' ) );
</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"> $comment_parent = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1404,7 +1404,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"> if ( '' == $_POST['content'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'ERROR: Please type a comment.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Error: Please type a comment.' ) );
</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 ( isset( $_POST['status'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/includes/file.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2074,7 +2074,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $error ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error_string = __( '<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_string = __( '<strong>Error</strong>: There was an error connecting to the server, Please verify the settings are correct.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $error ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_string = esc_html( $error->get_error_message() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesnetworkphp"></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/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/includes/network.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $is_apache;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The constant %s cannot be defined when creating a network.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hostname = get_clean_basedomain();
</span><span class="cx" style="display: block; padding: 0 10px"> $has_ports = strstr( $hostname, ':' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Port number. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You cannot use port numbers such as %s.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error_codes = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $errors ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="error"><p><strong>' . __( 'ERROR: The network could not be created.' ) . '</strong></p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $errors->get_error_messages() as $error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<p>$error</p>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/includes/user.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,12 +144,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* checking that username has been typed */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user->user_login == '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
</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"> /* checking that nickname has been typed */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update && empty( $user->nickname ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'nickname', __( '<strong>ERROR</strong>: Please enter a nickname.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
</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">@@ -165,17 +165,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for blank password when adding a user.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $update && empty( $pass1 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
</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"> // Check for "\" in password.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
</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"> // Checking the password has been typed twice the same.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'pass', __( '<strong>Error</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
</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 ( ! empty( $pass1 ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,11 +183,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"> if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
</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 ( ! $update && username_exists( $user->user_login ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/user.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,18 +194,18 @@
</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 class="cx" style="display: block; padding: 0 10px"> if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
</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"> /* checking email address */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user->user_email ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $user->user_email ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $owner_id = email_exists( $user->user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
</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="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-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/options.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,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"> if ( ! isset( $whitelist_options[ $option_page ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( '<strong>ERROR</strong>: Options page not found.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( '<strong>Error</strong>: Options page not found.' ) );
</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 ( 'options' == $option_page ) {
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/setup-config.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,12 +278,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $prefix ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
</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"> // Validate $prefix: it can only contain letters, numbers and underscores.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( '<strong>Error</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
</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"> // Test the DB connection.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->show_errors( $errors );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wpdb->last_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // MySQL was able to parse the prefix as a value, which we don't want. Bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) );
</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"> // Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></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/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/themes.php 2020-02-01 21:36:44 UTC (rev 47156)
</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"> $ct = wp_get_theme();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="error"><p>' . __( 'ERROR:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div class="error"><p>' . __( 'Error:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
</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="trunksrcwpadminusersphp"></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/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-admin/users.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Delete Users' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $_REQUEST['error'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><strong><?php _e( 'Error:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></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-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/class-wp-theme.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,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"> if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
</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-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/comment.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1224,19 +1224,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $max_lengths = wp_get_comment_fields_max_lengths();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: Your name is too long.' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'comment_author_column_length', __( '<strong>Error</strong>: Your name is too long.' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'comment_author_email_column_length', __( '<strong>ERROR</strong>: Your email address is too long.' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error</strong>: Your email address is too long.' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: Your url is too long.' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error</strong>: Your URL is too long.' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: Your comment is too long.' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'comment_content_column_length', __( '<strong>Error</strong>: Your comment is too long.' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3352,9 +3352,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == $comment_author_email || '' == $comment_author ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: Please fill the required fields (name, email).' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields (name, email).' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $comment_author_email ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: Please enter a valid email address.' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3379,7 +3379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $comment_content && ! $allow_empty_comment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: Please type a comment.' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'require_valid_comment', __( '<strong>Error</strong>: Please type a comment.' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $check_max_lengths = wp_check_comment_data_max_lengths( $commentdata );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3393,7 +3393,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"> if ( ! $comment_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'comment_save_error', __( '<strong>ERROR</strong>: The comment could not be saved. Please try again later.' ), 500 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'comment_save_error', __( '<strong>Error</strong>: The comment could not be saved. Please try again later.' ), 500 );
</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 get_comment( $comment_id );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/functions.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1543,7 +1543,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"> if ( ! has_action( "do_feed_{$feed}" ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Error: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
</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="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/load.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,7 +489,7 @@
</span><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: 1: $table_prefix, 2: wp-config.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>$table_prefix</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></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-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/ms-deprecated.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the domain has been used already. We should return an error message.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( domain_exists($domain, $path, $site_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return __( '<strong>ERROR</strong>: Site URL already taken.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return __( '<strong>Error</strong>: Site URL already taken.' );
</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"> * Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
</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"> if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return __( '<strong>ERROR</strong>: Problem creating site entry.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return __( '<strong>Error</strong>: Problem creating site entry.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog($blog_id);
</span><span class="cx" style="display: block; padding: 0 10px"> install_blog($blog_id);
</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-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/pluggable.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,7 +541,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user == null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: What should the error message be? (Or would these even happen?)
</span><span class="cx" style="display: block; padding: 0 10px"> // Only needed if all authentication handlers fail to return anything.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_Error( 'authentication_failed', __( '<strong>Error</strong>: Invalid username, email address or incorrect password.' ) );
</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"> $ignore_codes = array( 'empty_username', 'empty_password' );
</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-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/user.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,11 +134,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $username ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error->add( 'empty_username', __( '<strong>ERROR</strong>: The username field is empty.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error->add( 'empty_username', __( '<strong>Error</strong>: The username field is empty.' ) );
</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 ( empty( $password ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error->add( 'empty_password', __( '<strong>ERROR</strong>: The password field is empty.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
</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 $error;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'incorrect_password',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: The password you entered for the username %s is incorrect.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . $username . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) .
</span><span class="cx" style="display: block; padding: 0 10px"> ' <a href="' . wp_lostpassword_url() . '">' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,11 +209,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $email ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Uses 'empty_username' for back-compat with wp_signon().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error->add( 'empty_username', __( '<strong>ERROR</strong>: The email field is empty.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error->add( 'empty_username', __( '<strong>Error</strong>: The email field is empty.' ) );
</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 ( empty( $password ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error->add( 'empty_password', __( '<strong>ERROR</strong>: The password field is empty.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
</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 $error;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'incorrect_password',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Email address. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: The password you entered for the email address %s is incorrect.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . $email . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) .
</span><span class="cx" style="display: block; padding: 0 10px"> ' <a href="' . wp_lostpassword_url() . '">' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $spammed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'spammer_account', __( '<strong>Error</strong>: Your account has been marked as a spammer.' ) );
</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 $user;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2265,7 +2265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_hasher;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( $user instanceof WP_User ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'invalidcombo', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
</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">@@ -2494,29 +2494,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the username.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $sanitized_user_login == '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! validate_username( $user_login ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $sanitized_user_login = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( username_exists( $sanitized_user_login ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'username_exists', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
</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"> /** This filter is documented in wp-includes/user.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
</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"> // Check the email address.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_email == '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $user_email ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_email = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( email_exists( $user_email ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ) );
</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">@@ -2561,7 +2561,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'registerfail',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Admin email address. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_option( 'admin_email' )
</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">@@ -2796,7 +2796,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_email( $_POST['email'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: The email address isn’t correct.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: The email address isn’t correct.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'form-field' => 'email',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2808,7 +2808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( email_exists( $_POST['email'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: The email address is already used.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: The email address is already used.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'form-field' => 'email',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></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/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-includes/wp-db.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3498,7 +3498,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the server has the required MySQL version.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'database_version', sprintf( __( '<strong>Error</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
</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="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/src/wp-login.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,11 +367,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_data = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Enter a username or email address.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'empty_username', __( '<strong>Error</strong>: Enter a username or email address.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( strpos( $_POST['user_login'], '@' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_data ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalid_email', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
</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"> $login = trim( wp_unslash( $_POST['user_login'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,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"> if ( ! $user_data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return $errors;
</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">@@ -463,7 +463,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'retrieve_password_email_failure',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Documentation URL. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
</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">@@ -1206,7 +1206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_cookie',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/cookies/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/forums/' )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_cookie',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Browser cookie documentation URL. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' )
</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="trunktestsphpunitincludesbootstrapphp"></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/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/tests/phpunit/includes/bootstrap.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer, $wp_theme_directories;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_readable( $config_file_path ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "ERROR: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "Error: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> exit( 1 );
</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">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "ERROR: Looks like you're using PHPUnit %s. WordPress is currently only compatible with PHPUnit up to 7.x.\n",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "Error: Looks like you're using PHPUnit %s. WordPress is currently only compatible with PHPUnit up to 7.x.\n",
</ins><span class="cx" style="display: block; padding: 0 10px"> tests_get_phpunit_version()
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> echo "Please use the latest PHPUnit version from the 7.x branch.\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,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"> if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "ERROR: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "Error: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> exit( 1 );
</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="trunktestsphpunitincludestracphp"></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/trac.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/trac.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/tests/phpunit/includes/trac.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
</span><span class="cx" style="display: block; padding: 0 10px"> public static function usingLocalCache() {
</span><span class="cx" style="display: block; padding: 0 10px"> echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo 'Info: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL;
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "\x1b[0m\x1b[2K";
</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">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
</span><span class="cx" style="display: block; padding: 0 10px"> public static function forcingKnownBugs() {
</span><span class="cx" style="display: block; padding: 0 10px"> echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "Error: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "\x1b[0m\x1b[2K";
</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="trunktestsphpunittestsajaxReplytoCommentphp"></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/ajax/ReplytoComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2020-02-01 21:11:08 UTC (rev 47155)
+++ trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2020-02-01 21:36:44 UTC (rev 47156)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['comment_post_ID'] = self::$draft_post->ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the request.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedException( 'WPAjaxDieStopException', 'ERROR: You are replying to a comment on a draft post.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->setExpectedException( 'WPAjaxDieStopException', 'Error: You are replying to a comment on a draft post.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_handleAjax( 'replyto-comment' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>