<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14298] trunk/wp-includes/ms-functions.php:
Display the original username on the signup form on error, fixes #13124</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14298">14298</a></dd>
<dt>Author</dt> <dd>donncha</dd>
<dt>Date</dt> <dd>2010-04-29 16:05:33 +0000 (Thu, 29 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Display the original username on the signup form on error, fixes <a href="http://trac.wordpress.org/ticket/13124">#13124</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14297 => 14298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-04-29 14:58:22 UTC (rev 14297)
+++ trunk/wp-includes/ms-functions.php 2010-04-29 16:05:33 UTC (rev 14298)
</span><span class="lines">@@ -456,18 +456,21 @@
</span><span class="cx">
</span><span class="cx"> $errors = new WP_Error();
</span><span class="cx">
</span><ins>+ $orig_username = $user_name;
</ins><span class="cx"> $user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
</span><ins>+ $maybe = array();
+ preg_match( '/[a-z0-9]+/', $user_name, $maybe );
+
+ if ( $user_name != $orig_username || $user_name != $maybe[0] ) {
+ $errors->add( 'user_name', __( "Only the lowercase letters a-z and numbers allowed" ) );
+ $user_name = $orig_username;
+ }
+
</ins><span class="cx"> $user_email = sanitize_email( $user_email );
</span><span class="cx">
</span><span class="cx"> if ( empty( $user_name ) )
</span><span class="cx"> $errors->add('user_name', __('Please enter a username'));
</span><span class="cx">
</span><del>- $maybe = array();
- preg_match( '/[a-z0-9]+/', $user_name, $maybe );
-
- if ( $user_name != $maybe[0] )
- $errors->add('user_name', __('Only lowercase letters and numbers allowed'));
-
</del><span class="cx"> $illegal_names = get_site_option( 'illegal_names' );
</span><span class="cx"> if ( is_array( $illegal_names ) == false ) {
</span><span class="cx"> $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
</span><span class="lines">@@ -535,7 +538,7 @@
</span><span class="cx"> $errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $result = array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors);
</del><ins>+ $result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
</ins><span class="cx">
</span><span class="cx"> return apply_filters('wpmu_validate_user_signup', $result);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>