<!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>[18909] trunk/wp-includes: Don't stomp meta fields in wp_update_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, #logmsg > ol { margin-left: 0; 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/18909">18909</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-10-07 02:34:41 +0000 (Fri, 07 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't stomp meta fields in wp_update_user(). Props scribu. see <a href="http://core.trac.wordpress.org/ticket/15458">#15458</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (18908 => 18909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2011-10-06 23:43:20 UTC (rev 18908)
+++ trunk/wp-includes/capabilities.php 2011-10-07 02:34:41 UTC (rev 18909)
</span><span class="lines">@@ -474,6 +474,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $field The field to query against: 'id', 'slug', 'email' or 'login'
</span><span class="cx"> * @param string|int $value The field value
</span><ins>+ * @return object Raw user object
</ins><span class="cx"> */
</span><span class="cx"> static function get_data_by( $field, $value ) {
</span><span class="cx"> global $wpdb;
</span><span class="lines">@@ -618,10 +619,10 @@
</span><span class="cx"> * property matching the 'cap_key' exists and is an array. If so, it will be
</span><span class="cx"> * used.
</span><span class="cx"> *
</span><ins>+ * @access protected
</ins><span class="cx"> * @since 2.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $cap_key Optional capability key
</span><del>- * @access protected
</del><span class="cx"> */
</span><span class="cx"> function _init_caps( $cap_key = '' ) {
</span><span class="cx"> global $wpdb;
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (18908 => 18909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2011-10-06 23:43:20 UTC (rev 18908)
+++ trunk/wp-includes/user.php 2011-10-07 02:34:41 UTC (rev 18909)
</span><span class="lines">@@ -1354,23 +1354,10 @@
</span><span class="cx"> $user_id = (int) $wpdb->insert_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- update_user_meta( $user_id, 'first_name', $first_name );
- update_user_meta( $user_id, 'last_name', $last_name );
- update_user_meta( $user_id, 'nickname', $nickname );
- update_user_meta( $user_id, 'description', $description );
- update_user_meta( $user_id, 'rich_editing', $rich_editing );
- update_user_meta( $user_id, 'comment_shortcuts', $comment_shortcuts );
- update_user_meta( $user_id, 'admin_color', $admin_color );
- update_user_meta( $user_id, 'use_ssl', $use_ssl );
- update_user_meta( $user_id, 'show_admin_bar_front', $show_admin_bar_front );
</del><ins>+ $user = new WP_User( $user_id );
</ins><span class="cx">
</span><del>- $user = new WP_User($user_id);
-
- foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
- if ( empty($$method) )
- $$method = '';
-
- update_user_meta( $user_id, $method, $$method );
</del><ins>+ foreach ( _get_additional_user_keys( $user ) as $key ) {
+ update_user_meta( $user_id, $key, $$key );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($role) )
</span><span class="lines">@@ -1412,10 +1399,17 @@
</span><span class="cx"> $ID = (int) $userdata['ID'];
</span><span class="cx">
</span><span class="cx"> // First, get all of the original fields
</span><del>- $user = WP_User::get_data_by('id', $ID);
</del><ins>+ $user_obj = get_userdata( $ID );
</ins><span class="cx">
</span><ins>+ $user = get_object_vars( $user_obj->data );
+
+ // Add additional custom fields
+ foreach ( _get_additional_user_keys( $user_obj ) as $key ) {
+ $user[ $key ] = get_user_meta( $ID, $key, true );
+ }
+
</ins><span class="cx"> // Escape data pulled from DB.
</span><del>- $user = add_magic_quotes(get_object_vars($user));
</del><ins>+ $user = add_magic_quotes( $user );
</ins><span class="cx">
</span><span class="cx"> // If password is changing, hash it now.
</span><span class="cx"> if ( ! empty($userdata['user_pass']) ) {
</span><span class="lines">@@ -1466,6 +1460,20 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Return a list of meta keys that wp_insert_user() is supposed to set.
+ *
+ * @access private
+ * @since 3.3.0
+ *
+ * @param object $user WP_User instance
+ * @return array
+ */
+function _get_additional_user_keys( $user ) {
+ $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
+ return array_merge( $keys, array_keys( _wp_get_user_contactmethods( $user ) ) );
+}
+
+/**
</ins><span class="cx"> * Set up the default contact methods
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span></span></pre>
</div>
</div>
</body>
</html>