<!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>[12468] trunk/wp-includes/registration.php:
Add stricter checks to wp_insert_user() to ensure we don'
t create a user with an empty user_login but return a WP_Error instead.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12468">12468</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-21 15:25:00 +0000 (Mon, 21 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add stricter checks to wp_insert_user() to ensure we don't create a user with an empty user_login but return a WP_Error instead. Fixes <a href="http://trac.wordpress.org/ticket/11548">#11548</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesregistrationphp">trunk/wp-includes/registration.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesregistrationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/registration.php (12467 => 12468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/registration.php 2009-12-21 09:11:28 UTC (rev 12467)
+++ trunk/wp-includes/registration.php 2009-12-21 15:25:00 UTC (rev 12468)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> * @uses do_action() Calls 'user_register' hook when creating a new user giving the user's ID
</span><span class="cx"> *
</span><span class="cx"> * @param array $userdata An array of user data.
</span><del>- * @return int The newly created user's ID.
</del><ins>+ * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not be created.
</ins><span class="cx"> */
</span><span class="cx"> function wp_insert_user($userdata) {
</span><span class="cx"> global $wpdb;
</span><span class="lines">@@ -118,7 +118,14 @@
</span><span class="cx">
</span><span class="cx"> $user_login = sanitize_user($user_login, true);
</span><span class="cx"> $user_login = apply_filters('pre_user_login', $user_login);
</span><del>-
</del><ins>+
+ //Remove any non-printable chars from the login string to see if we have ended up with an empty username
+ $user_login = trim($user_login);
+
+ if ( empty($user_login) ) {
+ return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
+ }
+
</ins><span class="cx"> if ( empty($user_nicename) )
</span><span class="cx"> $user_nicename = sanitize_title( $user_login );
</span><span class="cx"> $user_nicename = apply_filters('pre_user_nicename', $user_nicename);
</span></span></pre>
</div>
</div>
</body>
</html>