<!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>[28454] trunk/src/wp-includes/user.php: Eliminate use of `extract()` in `wp_insert_user()`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28454">28454</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-16 18:15:00 +0000 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_insert_user()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/user.php (28453 => 28454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/user.php 2014-05-16 18:05:21 UTC (rev 28453)
+++ trunk/src/wp-includes/user.php 2014-05-16 18:15:00 UTC (rev 28454)
</span><span class="lines">@@ -1535,25 +1535,25 @@
</span><span class="cx"> function wp_insert_user( $userdata ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( is_a( $userdata, 'stdClass' ) )
</del><ins>+ if ( is_a( $userdata, 'stdClass' ) ) {
</ins><span class="cx"> $userdata = get_object_vars( $userdata );
</span><del>- elseif ( is_a( $userdata, 'WP_User' ) )
</del><ins>+ } elseif ( is_a( $userdata, 'WP_User' ) ) {
</ins><span class="cx"> $userdata = $userdata->to_array();
</span><del>-
- extract( $userdata, EXTR_SKIP );
-
</del><ins>+ }
</ins><span class="cx"> // Are we updating or creating?
</span><del>- if ( !empty($ID) ) {
- $ID = (int) $ID;
</del><ins>+ if ( ! empty( $userdata['ID'] ) ) {
+ $ID = (int) $userdata['ID'];
</ins><span class="cx"> $update = true;
</span><span class="cx"> $old_user_data = WP_User::get_data_by( 'id', $ID );
</span><ins>+ // hashed in wp_update_user(), plaintext if called directly
+ $user_pass = $userdata['user_pass'];
</ins><span class="cx"> } else {
</span><span class="cx"> $update = false;
</span><span class="cx"> // Hash the password
</span><del>- $user_pass = wp_hash_password($user_pass);
</del><ins>+ $user_pass = wp_hash_password( $userdata['user_pass'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $user_login = sanitize_user($user_login, true);
</del><ins>+ $sanitized_user_login = sanitize_user( $userdata['user_login'], true );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter a username after it has been sanitized.
</span><span class="lines">@@ -1562,22 +1562,24 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.3
</span><span class="cx"> *
</span><del>- * @param string $user_login Username after it has been sanitized.
</del><ins>+ * @param string $sanitized_user_login Username after it has been sanitized.
</ins><span class="cx"> */
</span><del>- $user_login = apply_filters( 'pre_user_login', $user_login );
</del><ins>+ $pre_user_login = apply_filters( 'pre_user_login', $sanitized_user_login );
</ins><span class="cx">
</span><span class="cx"> //Remove any non-printable chars from the login string to see if we have ended up with an empty username
</span><del>- $user_login = trim($user_login);
</del><ins>+ $user_login = trim( $pre_user_login );
</ins><span class="cx">
</span><del>- if ( empty($user_login) )
</del><ins>+ if ( empty( $user_login ) ) {
</ins><span class="cx"> return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
</span><del>-
- if ( !$update && username_exists( $user_login ) )
</del><ins>+ }
+ if ( ! $update && username_exists( $user_login ) ) {
</ins><span class="cx"> return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
</span><del>-
- if ( empty($user_nicename) )
</del><ins>+ }
+ if ( empty( $userdata['user_nicename'] ) ) {
</ins><span class="cx"> $user_nicename = sanitize_title( $user_login );
</span><del>-
</del><ins>+ } else {
+ $user_nicename = $userdata['user_nicename'];
+ }
</ins><span class="cx"> /**
</span><span class="cx"> * Filter a user's nicename before the user is created or updated.
</span><span class="cx"> *
</span><span class="lines">@@ -1587,8 +1589,7 @@
</span><span class="cx"> */
</span><span class="cx"> $user_nicename = apply_filters( 'pre_user_nicename', $user_nicename );
</span><span class="cx">
</span><del>- if ( empty($user_url) )
- $user_url = '';
</del><ins>+ $user_url = empty( $userdata['user_url'] ) ? '' : $userdata['user_url'];
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter a user's URL before the user is created or updated.
</span><span class="lines">@@ -1599,8 +1600,7 @@
</span><span class="cx"> */
</span><span class="cx"> $user_url = apply_filters( 'pre_user_url', $user_url );
</span><span class="cx">
</span><del>- if ( empty($user_email) )
- $user_email = '';
</del><ins>+ $user_email = empty( $userdata['user_email'] ) ? '' : $userdata['user_email'];
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter a user's email before the user is created or updated.
</span><span class="lines">@@ -1611,12 +1611,10 @@
</span><span class="cx"> */
</span><span class="cx"> $user_email = apply_filters( 'pre_user_email', $user_email );
</span><span class="cx">
</span><del>- if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) )
</del><ins>+ if ( ! $update && ! defined( 'WP_IMPORTING' ) && email_exists( $user_email ) ) {
</ins><span class="cx"> return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
</span><del>-
- if ( empty($nickname) )
- $nickname = $user_login;
-
</del><ins>+ }
+ $nickname = empty( $userdata['nickname'] ) ? $user_login : $userdata['nickname'];
</ins><span class="cx"> /**
</span><span class="cx"> * Filter a user's nickname before the user is created or updated.
</span><span class="cx"> *
</span><span class="lines">@@ -1626,8 +1624,7 @@
</span><span class="cx"> */
</span><span class="cx"> $nickname = apply_filters( 'pre_user_nickname', $nickname );
</span><span class="cx">
</span><del>- if ( empty($first_name) )
- $first_name = '';
</del><ins>+ $first_name = empty( $userdata['first_name'] ) ? '' : $userdata['first_name'];
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter a user's first name before the user is created or updated.
</span><span class="lines">@@ -1638,8 +1635,7 @@
</span><span class="cx"> */
</span><span class="cx"> $first_name = apply_filters( 'pre_user_first_name', $first_name );
</span><span class="cx">
</span><del>- if ( empty($last_name) )
- $last_name = '';
</del><ins>+ $last_name = empty( $userdata['last_name'] ) ? '' : $userdata['last_name'];
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter a user's last name before the user is created or updated.
</span><span class="lines">@@ -1650,18 +1646,21 @@
</span><span class="cx"> */
</span><span class="cx"> $last_name = apply_filters( 'pre_user_last_name', $last_name );
</span><span class="cx">
</span><del>- if ( empty( $display_name ) ) {
- if ( $update )
</del><ins>+ if ( empty( $userdata['display_name'] ) ) {
+ if ( $update ) {
</ins><span class="cx"> $display_name = $user_login;
</span><del>- elseif ( $first_name && $last_name )
</del><ins>+ } elseif ( $first_name && $last_name ) {
</ins><span class="cx"> /* translators: 1: first name, 2: last name */
</span><span class="cx"> $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $first_name, $last_name );
</span><del>- elseif ( $first_name )
</del><ins>+ } elseif ( $first_name ) {
</ins><span class="cx"> $display_name = $first_name;
</span><del>- elseif ( $last_name )
</del><ins>+ } elseif ( $last_name ) {
</ins><span class="cx"> $display_name = $last_name;
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $display_name = $user_login;
</span><ins>+ }
+ } else {
+ $display_name = $userdata['display_name'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1673,8 +1672,7 @@
</span><span class="cx"> */
</span><span class="cx"> $display_name = apply_filters( 'pre_user_display_name', $display_name );
</span><span class="cx">
</span><del>- if ( empty($description) )
- $description = '';
</del><ins>+ $description = empty( $userdata['description'] ) ? '' : $userdata['description'];
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter a user's description before the user is created or updated.
</span><span class="lines">@@ -1685,24 +1683,18 @@
</span><span class="cx"> */
</span><span class="cx"> $description = apply_filters( 'pre_user_description', $description );
</span><span class="cx">
</span><del>- if ( empty($rich_editing) )
- $rich_editing = 'true';
</del><ins>+ $rich_editing = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
</ins><span class="cx">
</span><del>- if ( empty($comment_shortcuts) )
- $comment_shortcuts = 'false';
</del><ins>+ $comment_shortcuts = empty( $userdata['comment_shortcuts'] ) ? 'false' : $userdata['comment_shortcuts'];
</ins><span class="cx">
</span><del>- if ( empty($admin_color) )
- $admin_color = 'fresh';
- $admin_color = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
</del><ins>+ $admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
+ $admin_color = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
</ins><span class="cx">
</span><del>- if ( empty($use_ssl) )
- $use_ssl = 0;
</del><ins>+ $use_ssl = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
</ins><span class="cx">
</span><del>- if ( empty($user_registered) )
- $user_registered = gmdate('Y-m-d H:i:s');
</del><ins>+ $user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered'];
</ins><span class="cx">
</span><del>- if ( empty($show_admin_bar_front) )
- $show_admin_bar_front = 'true';
</del><ins>+ $show_admin_bar_front = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
</ins><span class="cx">
</span><span class="cx"> $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
</span><span class="cx">
</span><span class="lines">@@ -1730,18 +1722,19 @@
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><span class="cx"> foreach ( _get_additional_user_keys( $user ) as $key ) {
</span><del>- if ( isset( $$key ) )
</del><ins>+ if ( isset( $$key ) ) {
</ins><span class="cx"> update_user_meta( $user_id, $key, $$key );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($role) )
- $user->set_role($role);
- elseif ( !$update )
</del><ins>+ if ( isset( $userdata['role'] ) ) {
+ $user->set_role( $userdata['role'] );
+ } elseif ( ! $update ) {
</ins><span class="cx"> $user->set_role(get_option('default_role'));
</span><ins>+ }
+ wp_cache_delete( $user_id, 'users' );
+ wp_cache_delete( $user_login, 'userlogins' );
</ins><span class="cx">
</span><del>- wp_cache_delete($user_id, 'users');
- wp_cache_delete($user_login, 'userlogins');
-
</del><span class="cx"> if ( $update ) {
</span><span class="cx"> /**
</span><span class="cx"> * Fires immediately after an existing user is updated.
</span></span></pre>
</div>
</div>
</body>
</html>