<!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>[33774] trunk/src: Drop the hyphen from e-mail and standardize on email.</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 { 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/33774">33774</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/33774","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-28 03:16:02 +0000 (Fri, 28 Aug 2015)</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'>Drop the hyphen from e-mail and standardize on email.
The AP Stylebook changed this in 2011, and we're woefully inconsistent, so let's go with the standard.
props morganestes, voldemortensen, niallkennedy (for patching on the previous AP style).
fixes <a href="https://core.trac.wordpress.org/ticket/26156">#26156</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionswritingphp">trunk/src/wp-admin/options-writing.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatcommentspopupphp">trunk/src/wp-includes/theme-compat/comments-popup.php</a></li>
<li><a href="#trunksrcwpincludesuserfunctionsphp">trunk/src/wp-includes/user-functions.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/comment.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $comment->comment_author_email ) { ?>
</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('E-mail'); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<th scope="row"><?php _e('Email'); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo $comment->comment_author_email; ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span></span></pre></div>
<a id="trunksrcwpadmineditformcommentphp"></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/edit-form-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-comment.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/edit-form-comment.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></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">- <td class="first"><label for="email"><?php _e( 'E-mail:' ); ?></label></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => '<input type="checkbox" />',
</span><span class="cx" style="display: block; padding: 0 10px"> 'username' => __( 'Username' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'email' => __( 'E-mail' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'email' => __( 'Email' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'registered' => _x( 'Registered', 'user' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogs' => __( 'Sites' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => '<input type="checkbox" />',
</span><span class="cx" style="display: block; padding: 0 10px"> 'username' => __( 'Username' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'email' => __( 'E-mail' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'email' => __( 'Email' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => __( 'Role' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts' => __( 'Posts' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/includes/schema.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,7 +895,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_user = get_user_by( 'email', $email );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_email( $email ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $errors->get_error_code() )
</span><span class="cx" style="display: block; padding: 0 10px"> return $errors;
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/includes/template.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inside">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="author-email"><?php _e('E-mail') ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="author-email"><?php _e('Email') ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/includes/user.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,9 +149,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$update && username_exists( $user->user_login ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* checking e-mail address */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* checking email address */
</ins><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 e-mail 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><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></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/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/install.php 2015-08-28 03:16:02 UTC (rev 33774)
</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"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check e-mail address.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check email address.
</ins><span class="cx" style="display: block; padding: 0 10px"> $error = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_name ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: poka-yoke
</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 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/options-discussion.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e('Other comment settings'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail'); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and email'); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="comment_registration">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,8 +144,8 @@
</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('E-mail me whenever'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<th scope="row"><?php _e('Email me whenever'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Email me whenever'); ?></span></legend>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="comments_notify">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e('Anyone posts a comment'); ?> </label>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so “press” will match “WordPress”.'); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP 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><span class="cx" style="display: block; padding: 0 10px"> <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e('Comment Blacklist'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so “press” will match “WordPress”.'); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be marked as spam. One word or IP 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><span class="cx" style="display: block; padding: 0 10px"> <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e('Default Avatar'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.'); ?><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar_defaults = array(
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></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-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/options-general.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></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"><label for="admin_email"><?php _e('E-mail Address') ?> </label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<th scope="row"><label for="admin_email"><?php _e('Email Address') ?> </label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="admin-email-description"><?php _e( 'This address is used for admin purposes, like new user notification.' ) ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,14 +154,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</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"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<th scope="row"><label for="new_admin_email"><?php _e('Email Address') ?> </label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ) ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ) ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_admin_email = get_option( 'new_admin_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="updated inline">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php printf( __('There is a pending change of the admin email to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></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"> </td>
</span></span></pre></div>
<a id="trunksrcwpadminoptionswritingphp"></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-writing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-writing.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/options-writing.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'options-postemail',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Post Via Email' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '</p>',
</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">@@ -113,8 +113,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/options.php */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h3 class="title"><?php _e('Post via e-mail') ?></h3>
-<p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h3 class="title"><?php _e('Post via email') ?></h3>
+<p><?php printf(__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></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/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/user-edit.php 2015-08-28 03:16:02 UTC (rev 33774)
</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"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-email-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_email = get_option( $current_user->ID . '_new_email' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +404,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="updated inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php
</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">- __( 'There is a pending change of your e-mail to %1$s. <a href="%2$s">Cancel</a>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'There is a pending change of your email to %1$s. <a href="%2$s">Cancel</a>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $new_email['newemail'] . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-admin/user-new.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,11 +289,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_super_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $label = __('E-mail');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $label = __('Email');
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'email';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $label = __('E-mail or Username');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $label = __('Email or Username');
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'text';
</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">@@ -377,7 +377,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr( $new_user_login ); ?>" aria-required="true" autocapitalize="none" autocorrect="off" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( !is_multisite() ) { ?>
</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 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-includes/pluggable.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1463,7 +1463,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: comment author, 2: author IP, 3: author domain */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1593,7 +1593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1706,7 +1706,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message .= sprintf(__('Email: %s'), $user->user_email) . "\r\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesthemecompatcommentspopupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme-compat/comments-popup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/comments-popup.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-includes/theme-compat/comments-popup.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( comments_open() ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e('Leave a comment'); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php printf(__('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php printf(__('Line and paragraph breaks automatic, email address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $user_ID ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="email" id="email" value="<?php echo esc_attr( $commenter['comment_author_email'] ); ?>" size="28" tabindex="2" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="email"><?php _e('E-mail'); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="email"><?php _e('Email'); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span></span></pre></div>
<a id="trunksrcwpincludesuserfunctionsphp"></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-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user-functions.php 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-includes/user-functions.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1950,9 +1950,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check the e-mail address
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check the email address
</ins><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 e-mail 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><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_email = '';
</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 2015-08-27 20:56:54 UTC (rev 33773)
+++ trunk/src/wp-login.php 2015-08-28 03:16:02 UTC (rev 33774)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_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 e-mail 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( $_POST['user_login'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_data ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,7 @@
</span><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"> if ( !$user_data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.'));
</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">@@ -407,7 +407,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="user_login" ><?php _e('Username or E-mail:') ?><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="user_login" ><?php _e('Username or Email:') ?><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,18 +748,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="user_email"><?php _e('E-mail') ?><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="user_email"><?php _e('Email') ?><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires following the 'E-mail' field in the user registration form.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires following the 'Email' field in the user registration form.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'register_form' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p id="reg_passmail"><?php _e( 'Registration confirmation will be e-mailed to you.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <br class="clear" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -872,11 +872,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('registerdisabled', __('User registration is currently not allowed.'));
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add('newpass', __('Check your email for your new password.'), 'message');
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add('registered', __('Registration complete. Please check your email.'), 'message');
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( strpos( $redirect_to, 'about.php?updated' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what’s new.' ), 'message' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>