<!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>[21496] trunk: Allow passing stdClass and WP_User to wp_insert_user() and 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/21496">21496</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-08-10 15:36:54 +0000 (Fri, 10 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow passing stdClass and WP_User to wp_insert_user() and wp_update_user(). Introduce WP_User::to_array(). Eliminate uses of get_object_vars() when passing to wp_*_user(). fixes <a href="http://core.trac.wordpress.org/ticket/21429">#21429</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<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="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (21495 => 21496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2012-08-10 07:11:03 UTC (rev 21495)
+++ trunk/wp-admin/includes/user.php 2012-08-10 15:36:54 UTC (rev 21496)
</span><span class="lines">@@ -156,9 +156,9 @@
</span><span class="cx"> return $errors;
</span><span class="cx">
</span><span class="cx"> if ( $update ) {
</span><del>- $user_id = wp_update_user( get_object_vars( $user ) );
</del><ins>+ $user_id = wp_update_user( $user );
</ins><span class="cx"> } else {
</span><del>- $user_id = wp_insert_user( get_object_vars( $user ) );
</del><ins>+ $user_id = wp_insert_user( $user );
</ins><span class="cx"> wp_new_user_notification( $user_id, isset($_POST['send_password']) ? $pass1 : '' );
</span><span class="cx"> }
</span><span class="cx"> return $user_id;
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (21495 => 21496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2012-08-10 07:11:03 UTC (rev 21495)
+++ trunk/wp-admin/user-edit.php 2012-08-10 15:36:54 UTC (rev 21496)
</span><span class="lines">@@ -82,11 +82,12 @@
</span><span class="cx"> if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
</span><span class="cx"> $new_email = get_option( $current_user->ID . '_new_email' );
</span><span class="cx"> if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
</span><ins>+ $user = new stdClass;
</ins><span class="cx"> $user->ID = $current_user->ID;
</span><span class="cx"> $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
</span><span class="cx"> if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
</span><del>- wp_update_user( get_object_vars( $user ) );
</del><ins>+ wp_update_user( $user );
</ins><span class="cx"> delete_option( $current_user->ID . '_new_email' );
</span><span class="cx"> wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
</span><span class="cx"> die();
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (21495 => 21496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2012-08-10 07:11:03 UTC (rev 21495)
+++ trunk/wp-includes/capabilities.php 2012-08-10 15:36:54 UTC (rev 21496)
</span><span class="lines">@@ -665,6 +665,17 @@
</span><span class="cx"> return $this->__isset( $key );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /*
+ * Return an array representation.
+ *
+ * @since 3.5.0
+ *
+ * @return array Array representation.
+ */
+ function to_array() {
+ return get_object_vars( $this->data );
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Set up capability object properties.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (21495 => 21496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2012-08-10 07:11:03 UTC (rev 21495)
+++ trunk/wp-includes/user.php 2012-08-10 15:36:54 UTC (rev 21496)
</span><span class="lines">@@ -1240,14 +1240,19 @@
</span><span class="cx"> * @uses do_action() Calls 'profile_update' hook when updating giving the user's ID
</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><del>- * @param array $userdata An array of user data.
</del><ins>+ * @param mixed $userdata An array of user data or a user object of type stdClass or WP_User.
</ins><span class="cx"> * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not be created.
</span><span class="cx"> */
</span><del>-function wp_insert_user($userdata) {
</del><ins>+function wp_insert_user( $userdata ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- extract($userdata, EXTR_SKIP);
</del><ins>+ if ( is_a( $userdata, 'stdClass' ) )
+ $userdata = get_object_vars( $userdata );
+ elseif ( is_a( $userdata, 'WP_User' ) )
+ $userdata = $userdata->to_array();
</ins><span class="cx">
</span><ins>+ extract( $userdata, EXTR_SKIP );
+
</ins><span class="cx"> // Are we updating or creating?
</span><span class="cx"> if ( !empty($ID) ) {
</span><span class="cx"> $ID = (int) $ID;
</span><span class="lines">@@ -1387,16 +1392,21 @@
</span><span class="cx"> * @see wp_insert_user() For what fields can be set in $userdata
</span><span class="cx"> * @uses wp_insert_user() Used to update existing user or add new one if user doesn't exist already
</span><span class="cx"> *
</span><del>- * @param array $userdata An array of user data.
</del><ins>+ * @param mixed $userdata An array of user data or a user object of type stdClass or WP_User.
</ins><span class="cx"> * @return int The updated user's ID.
</span><span class="cx"> */
</span><span class="cx"> function wp_update_user($userdata) {
</span><ins>+ if ( is_a( $userdata, 'stdClass' ) )
+ $userdata = get_object_vars( $userdata );
+ elseif ( is_a( $userdata, 'WP_User' ) )
+ $userdata = $userdata->to_array();
+
</ins><span class="cx"> $ID = (int) $userdata['ID'];
</span><span class="cx">
</span><span class="cx"> // First, get all of the original fields
</span><span class="cx"> $user_obj = get_userdata( $ID );
</span><span class="cx">
</span><del>- $user = get_object_vars( $user_obj->data );
</del><ins>+ $user = $user_obj->to_array();
</ins><span class="cx">
</span><span class="cx"> // Add additional custom fields
</span><span class="cx"> foreach ( _get_additional_user_keys( $user_obj ) as $key ) {
</span></span></pre>
</div>
</div>
</body>
</html>