<!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>[28740] trunk/src/wp-includes/user.php: Don't use variable variables 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/28740">28740</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-11 18:20:57 +0000 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use variable variables in `wp_insert_user()`.
Add a local array, `$meta`, to provide substantial disambiguation among variables.
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</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 (28739 => 28740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/user.php 2014-06-11 18:17:52 UTC (rev 28739)
+++ trunk/src/wp-includes/user.php 2014-06-11 18:20:57 UTC (rev 28740)
</span><span class="lines">@@ -1643,6 +1643,10 @@
</span><span class="cx"> } else {
</span><span class="cx"> $user_nicename = $userdata['user_nicename'];
</span><span class="cx"> }
</span><ins>+
+ // Store values to save in user meta.
+ $meta = array();
+
</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">@@ -1652,32 +1656,33 @@
</span><span class="cx"> */
</span><span class="cx"> $user_nicename = apply_filters( 'pre_user_nicename', $user_nicename );
</span><span class="cx">
</span><del>- $user_url = empty( $userdata['user_url'] ) ? '' : $userdata['user_url'];
</del><ins>+ $raw_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="cx"> *
</span><span class="cx"> * @since 2.0.3
</span><span class="cx"> *
</span><del>- * @param string $user_url The user's URL.
</del><ins>+ * @param string $raw_user_url The user's URL.
</ins><span class="cx"> */
</span><del>- $user_url = apply_filters( 'pre_user_url', $user_url );
</del><ins>+ $user_url = apply_filters( 'pre_user_url', $raw_user_url );
</ins><span class="cx">
</span><del>- $user_email = empty( $userdata['user_email'] ) ? '' : $userdata['user_email'];
</del><ins>+ $raw_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="cx"> *
</span><span class="cx"> * @since 2.0.3
</span><span class="cx"> *
</span><del>- * @param string $user_email The user's email.
</del><ins>+ * @param string $raw_user_email The user's email.
</ins><span class="cx"> */
</span><del>- $user_email = apply_filters( 'pre_user_email', $user_email );
</del><ins>+ $user_email = apply_filters( 'pre_user_email', $raw_user_email );
</ins><span class="cx">
</span><span class="cx"> if ( ! $update && ! defined( 'WP_IMPORTING' ) && email_exists( $user_email ) ) {
</span><span class="cx"> return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
</span><span class="cx"> }
</span><span class="cx"> $nickname = empty( $userdata['nickname'] ) ? $user_login : $userdata['nickname'];
</span><ins>+
</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">@@ -1685,7 +1690,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $nickname The user's nickname.
</span><span class="cx"> */
</span><del>- $nickname = apply_filters( 'pre_user_nickname', $nickname );
</del><ins>+ $meta['nickname'] = apply_filters( 'pre_user_nickname', $nickname );
</ins><span class="cx">
</span><span class="cx"> $first_name = empty( $userdata['first_name'] ) ? '' : $userdata['first_name'];
</span><span class="cx">
</span><span class="lines">@@ -1696,7 +1701,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $first_name The user's first name.
</span><span class="cx"> */
</span><del>- $first_name = apply_filters( 'pre_user_first_name', $first_name );
</del><ins>+ $meta['first_name'] = apply_filters( 'pre_user_first_name', $first_name );
</ins><span class="cx">
</span><span class="cx"> $last_name = empty( $userdata['last_name'] ) ? '' : $userdata['last_name'];
</span><span class="cx">
</span><span class="lines">@@ -1707,18 +1712,18 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $last_name The user's last name.
</span><span class="cx"> */
</span><del>- $last_name = apply_filters( 'pre_user_last_name', $last_name );
</del><ins>+ $meta['last_name'] = apply_filters( 'pre_user_last_name', $last_name );
</ins><span class="cx">
</span><span class="cx"> if ( empty( $userdata['display_name'] ) ) {
</span><span class="cx"> if ( $update ) {
</span><span class="cx"> $display_name = $user_login;
</span><del>- } elseif ( $first_name && $last_name ) {
</del><ins>+ } elseif ( $meta['first_name'] && $meta['last_name'] ) {
</ins><span class="cx"> /* translators: 1: first name, 2: last name */
</span><del>- $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $first_name, $last_name );
- } elseif ( $first_name ) {
- $display_name = $first_name;
- } elseif ( $last_name ) {
- $display_name = $last_name;
</del><ins>+ $display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $meta['first_name'], $meta['last_name'] );
+ } elseif ( $meta['first_name'] ) {
+ $display_name = $meta['first_name'];
+ } elseif ( $meta['last_name'] ) {
+ $display_name = $meta['last_name'];
</ins><span class="cx"> } else {
</span><span class="cx"> $display_name = $user_login;
</span><span class="cx"> }
</span><span class="lines">@@ -1744,20 +1749,20 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $description The user's description.
</span><span class="cx"> */
</span><del>- $description = apply_filters( 'pre_user_description', $description );
</del><ins>+ $meta['description'] = apply_filters( 'pre_user_description', $description );
</ins><span class="cx">
</span><del>- $rich_editing = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
</del><ins>+ $meta['rich_editing'] = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
</ins><span class="cx">
</span><del>- $comment_shortcuts = empty( $userdata['comment_shortcuts'] ) ? 'false' : $userdata['comment_shortcuts'];
</del><ins>+ $meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) ? 'false' : $userdata['comment_shortcuts'];
</ins><span class="cx">
</span><span class="cx"> $admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
</span><del>- $admin_color = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
</del><ins>+ $meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
</ins><span class="cx">
</span><del>- $use_ssl = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
</del><ins>+ $meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
</ins><span class="cx">
</span><span class="cx"> $user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered'];
</span><span class="cx">
</span><del>- $show_admin_bar_front = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
</del><ins>+ $meta['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">@@ -1771,8 +1776,8 @@
</span><span class="cx"> $user_nicename = $alt_user_nicename;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $data = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
- $data = wp_unslash( $data );
</del><ins>+ $compacted = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
+ $data = wp_unslash( $compacted );
</ins><span class="cx">
</span><span class="cx"> if ( $update ) {
</span><span class="cx"> $wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
</span><span class="lines">@@ -1784,9 +1789,14 @@
</span><span class="cx">
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><del>- foreach ( _get_additional_user_keys( $user ) as $key ) {
- if ( isset( $$key ) ) {
- update_user_meta( $user_id, $key, $$key );
</del><ins>+ // Update user meta.
+ foreach ( $meta as $key => $value ) {
+ update_user_meta( $user_id, $key, $value );
+ }
+
+ foreach ( wp_get_user_contact_methods( $user ) as $key => $value ) {
+ if ( isset( $userdata[ $key ] ) ) {
+ update_user_meta( $user_id, $key, $userdata[ $key ] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>