<!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>[16009] trunk: Move registration.php functions to user.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16009">16009</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-27 10:46:24 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move registration.php functions to user.php. Deprecate registration.php, everything is now included by default. fixes <a href="http://trac.wordpress.org/ticket/13761">#13761</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesadminphp">trunk/wp-admin/includes/admin.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludesregistrationfunctionsphp">trunk/wp-includes/registration-functions.php</a></li>
<li><a href="#trunkwpincludesregistrationphp">trunk/wp-includes/registration.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-activate.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -11,8 +11,6 @@
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-require_once( ABSPATH . WPINC . '/registration.php');
-
</del><span class="cx"> if ( is_object( $wp_object_cache ) )
</span><span class="cx"> $wp_object_cache->cache_enabled = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-admin/admin-ajax.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -853,7 +853,6 @@
</span><span class="cx"> check_ajax_referer( $action );
</span><span class="cx"> if ( !current_user_can('create_users') )
</span><span class="cx"> die('-1');
</span><del>- require_once(ABSPATH . WPINC . '/registration.php');
</del><span class="cx"> if ( !$user_id = add_user() )
</span><span class="cx"> die('0');
</span><span class="cx"> elseif ( is_wp_error( $user_id ) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/admin.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/admin.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-admin/includes/admin.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -51,9 +51,6 @@
</span><span class="cx"> /** WordPress Update Administration API */
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/includes/update.php');
</span><span class="cx">
</span><del>-/** WordPress Registration API */
-require_once(ABSPATH . WPINC . '/registration.php');
-
</del><span class="cx"> /** WordPress Deprecated Administration API */
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-admin/user-new.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -15,9 +15,6 @@
</span><span class="cx"> if ( is_multisite() && !get_site_option( 'add_new_users' ) )
</span><span class="cx"> wp_die( __('Page disabled by the administrator') );
</span><span class="cx">
</span><del>-/** WordPress Registration API */
-require_once( ABSPATH . WPINC . '/registration.php');
-
</del><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> function admin_created_user_email( $text ) {
</span><span class="cx"> /* translators: 1: Site name, 2: site URL, 3: role */
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-admin/users.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -9,9 +9,6 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-/** WordPress Registration API */
-require_once( ABSPATH . WPINC . '/registration.php');
-
</del><span class="cx"> $wp_list_table = get_list_table('WP_Users_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesregistrationfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/registration-functions.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/registration-functions.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-includes/registration-functions.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -1,9 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Deprecated. Use registration.php.
</del><ins>+ * Deprecated. No longer needed.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><del>-_deprecated_file( basename(__FILE__), '2.1', WPINC . '/registration.php' );
-require_once(ABSPATH . WPINC . '/registration.php');
-?>
</del><ins>+_deprecated_file( basename(__FILE__), '2.1', null, __( 'This file no longer needs to be included.' ) );
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesregistrationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/registration.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/registration.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-includes/registration.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -1,333 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * User Registration API
</del><ins>+ * Deprecated. No longer needed.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><del>-
-/**
- * Checks whether the given username exists.
- *
- * @since 2.0.0
- *
- * @param string $username Username.
- * @return null|int The user's ID on success, and null on failure.
- */
-function username_exists( $username ) {
- if ( $user = get_userdatabylogin( $username ) ) {
- return $user->ID;
- } else {
- return null;
- }
-}
-
-/**
- * Checks whether the given email exists.
- *
- * @since 2.1.0
- * @uses $wpdb
- *
- * @param string $email Email.
- * @return bool|int The user's ID on success, and false on failure.
- */
-function email_exists( $email ) {
- if ( $user = get_user_by_email($email) )
- return $user->ID;
-
- return false;
-}
-
-/**
- * Checks whether an username is valid.
- *
- * @since 2.0.1
- * @uses apply_filters() Calls 'validate_username' hook on $valid check and $username as parameters
- *
- * @param string $username Username.
- * @return bool Whether username given is valid
- */
-function validate_username( $username ) {
- $sanitized = sanitize_user( $username, true );
- $valid = ( $sanitized == $username );
- return apply_filters( 'validate_username', $valid, $username );
-}
-
-/**
- * Insert an user into the database.
- *
- * Can update a current user or insert a new user based on whether the user's ID
- * is present.
- *
- * Can be used to update the user's info (see below), set the user's role, and
- * set the user's preference on whether they want the rich editor on.
- *
- * Most of the $userdata array fields have filters associated with the values.
- * The exceptions are 'rich_editing', 'role', 'jabber', 'aim', 'yim',
- * 'user_registered', and 'ID'. The filters have the prefix 'pre_user_' followed
- * by the field name. An example using 'description' would have the filter
- * called, 'pre_user_description' that can be hooked into.
- *
- * The $userdata array can contain the following fields:
- * 'ID' - An integer that will be used for updating an existing user.
- * 'user_pass' - A string that contains the plain text password for the user.
- * 'user_login' - A string that contains the user's username for logging in.
- * 'user_nicename' - A string that contains a nicer looking name for the user.
- * The default is the user's username.
- * 'user_url' - A string containing the user's URL for the user's web site.
- * 'user_email' - A string containing the user's email address.
- * 'display_name' - A string that will be shown on the site. Defaults to user's
- * username. It is likely that you will want to change this, for both
- * appearance and security through obscurity (that is if you don't use and
- * delete the default 'admin' user).
- * 'nickname' - The user's nickname, defaults to the user's username.
- * 'first_name' - The user's first name.
- * 'last_name' - The user's last name.
- * 'description' - A string containing content about the user.
- * 'rich_editing' - A string for whether to enable the rich editor. False
- * if not empty.
- * 'user_registered' - The date the user registered. Format is 'Y-m-d H:i:s'.
- * 'role' - A string used to set the user's role.
- * 'jabber' - User's Jabber account.
- * 'aim' - User's AOL IM account.
- * 'yim' - User's Yahoo IM account.
- *
- * @since 2.0.0
- * @uses $wpdb WordPress database layer.
- * @uses apply_filters() Calls filters for most of the $userdata fields with the prefix 'pre_user'. See note above.
- * @uses do_action() Calls 'profile_update' hook when updating giving the user's ID
- * @uses do_action() Calls 'user_register' hook when creating a new user giving the user's ID
- *
- * @param array $userdata An array of user data.
- * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not be created.
- */
-function wp_insert_user($userdata) {
- global $wpdb;
-
- extract($userdata, EXTR_SKIP);
-
- // Are we updating or creating?
- if ( !empty($ID) ) {
- $ID = (int) $ID;
- $update = true;
- $old_user_data = get_userdata($ID);
- } else {
- $update = false;
- // Hash the password
- $user_pass = wp_hash_password($user_pass);
- }
-
- $user_login = sanitize_user($user_login, true);
- $user_login = apply_filters('pre_user_login', $user_login);
-
- //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.') );
-
- if ( !$update && username_exists( $user_login ) )
- return new WP_Error('existing_user_login', __('This username is already registered.') );
-
- if ( empty($user_nicename) )
- $user_nicename = sanitize_title( $user_login );
- $user_nicename = apply_filters('pre_user_nicename', $user_nicename);
-
- if ( empty($user_url) )
- $user_url = '';
- $user_url = apply_filters('pre_user_url', $user_url);
-
- if ( empty($user_email) )
- $user_email = '';
- $user_email = apply_filters('pre_user_email', $user_email);
-
- if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) )
- return new WP_Error('existing_user_email', __('This email address is already registered.') );
-
- if ( empty($display_name) )
- $display_name = $user_login;
- $display_name = apply_filters('pre_user_display_name', $display_name);
-
- if ( empty($nickname) )
- $nickname = $user_login;
- $nickname = apply_filters('pre_user_nickname', $nickname);
-
- if ( empty($first_name) )
- $first_name = '';
- $first_name = apply_filters('pre_user_first_name', $first_name);
-
- if ( empty($last_name) )
- $last_name = '';
- $last_name = apply_filters('pre_user_last_name', $last_name);
-
- if ( empty($description) )
- $description = '';
- $description = apply_filters('pre_user_description', $description);
-
- if ( empty($rich_editing) )
- $rich_editing = 'true';
-
- if ( empty($comment_shortcuts) )
- $comment_shortcuts = 'false';
-
- if ( empty($admin_color) )
- $admin_color = 'fresh';
- $admin_color = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
-
- if ( empty($use_ssl) )
- $use_ssl = 0;
-
- if ( empty($user_registered) )
- $user_registered = gmdate('Y-m-d H:i:s');
-
- $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));
-
- if ( $user_nicename_check ) {
- $suffix = 2;
- while ($user_nicename_check) {
- $alt_user_nicename = $user_nicename . "-$suffix";
- $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
- $suffix++;
- }
- $user_nicename = $alt_user_nicename;
- }
-
- $data = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
- $data = stripslashes_deep( $data );
-
- if ( $update ) {
- $wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
- $user_id = (int) $ID;
- } else {
- $wpdb->insert( $wpdb->users, $data + compact( 'user_login' ) );
- $user_id = (int) $wpdb->insert_id;
- }
-
- 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);
-
- $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 );
- }
-
- if ( isset($role) )
- $user->set_role($role);
- elseif ( !$update )
- $user->set_role(get_option('default_role'));
-
- wp_cache_delete($user_id, 'users');
- wp_cache_delete($user_login, 'userlogins');
-
- if ( $update )
- do_action('profile_update', $user_id, $old_user_data);
- else
- do_action('user_register', $user_id);
-
- return $user_id;
-}
-
-/**
- * Update an user in the database.
- *
- * It is possible to update a user's password by specifying the 'user_pass'
- * value in the $userdata parameter array.
- *
- * If $userdata does not contain an 'ID' key, then a new user will be created
- * and the new user's ID will be returned.
- *
- * If current user's password is being updated, then the cookies will be
- * cleared.
- *
- * @since 2.0.0
- * @see wp_insert_user() For what fields can be set in $userdata
- * @uses wp_insert_user() Used to update existing user or add new one if user doesn't exist already
- *
- * @param array $userdata An array of user data.
- * @return int The updated user's ID.
- */
-function wp_update_user($userdata) {
- $ID = (int) $userdata['ID'];
-
- // First, get all of the original fields
- $user = get_userdata($ID);
-
- // Escape data pulled from DB.
- $user = add_magic_quotes(get_object_vars($user));
-
- // If password is changing, hash it now.
- if ( ! empty($userdata['user_pass']) ) {
- $plaintext_pass = $userdata['user_pass'];
- $userdata['user_pass'] = wp_hash_password($userdata['user_pass']);
- }
-
- wp_cache_delete($user[ 'user_email' ], 'useremail');
-
- // Merge old and new fields with new fields overwriting old ones.
- $userdata = array_merge($user, $userdata);
- $user_id = wp_insert_user($userdata);
-
- // Update the cookies if the password changed.
- $current_user = wp_get_current_user();
- if ( $current_user->id == $ID ) {
- if ( isset($plaintext_pass) ) {
- wp_clear_auth_cookie();
- wp_set_auth_cookie($ID);
- }
- }
-
- return $user_id;
-}
-
-/**
- * A simpler way of inserting an user into the database.
- *
- * Creates a new user with just the username, password, and email. For a more
- * detail creation of a user, use wp_insert_user() to specify more infomation.
- *
- * @since 2.0.0
- * @see wp_insert_user() More complete way to create a new user
- *
- * @param string $username The user's username.
- * @param string $password The user's password.
- * @param string $email The user's email (optional).
- * @return int The new user's ID.
- */
-function wp_create_user($username, $password, $email = '') {
- $user_login = esc_sql( $username );
- $user_email = esc_sql( $email );
- $user_pass = $password;
-
- $userdata = compact('user_login', 'user_email', 'user_pass');
- return wp_insert_user($userdata);
-}
-
-
-/**
- * Set up the default contact methods
- *
- * @access private
- * @since
- *
- * @param object $user User data object (optional)
- * @return array $user_contactmethods Array of contact methods and their labels.
- */
-function _wp_get_user_contactmethods( $user = null ) {
- $user_contactmethods = array(
- 'aim' => __('AIM'),
- 'yim' => __('Yahoo IM'),
- 'jabber' => __('Jabber / Google Talk')
- );
- return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
-}
-
-?>
</del><ins>+_deprecated_file( basename(__FILE__), '3.1', null, __( 'This file no longer needs to be included.' ) );
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-includes/user.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -1196,4 +1196,329 @@
</span><span class="cx"> wp_cache_delete('blogs_of_user-' . $id, 'users');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><ins>+/**
+ * Checks whether the given username exists.
+ *
+ * @since 2.0.0
+ *
+ * @param string $username Username.
+ * @return null|int The user's ID on success, and null on failure.
+ */
+function username_exists( $username ) {
+ if ( $user = get_userdatabylogin( $username ) ) {
+ return $user->ID;
+ } else {
+ return null;
+ }
+}
+
+/**
+ * Checks whether the given email exists.
+ *
+ * @since 2.1.0
+ * @uses $wpdb
+ *
+ * @param string $email Email.
+ * @return bool|int The user's ID on success, and false on failure.
+ */
+function email_exists( $email ) {
+ if ( $user = get_user_by_email($email) )
+ return $user->ID;
+
+ return false;
+}
+
+/**
+ * Checks whether an username is valid.
+ *
+ * @since 2.0.1
+ * @uses apply_filters() Calls 'validate_username' hook on $valid check and $username as parameters
+ *
+ * @param string $username Username.
+ * @return bool Whether username given is valid
+ */
+function validate_username( $username ) {
+ $sanitized = sanitize_user( $username, true );
+ $valid = ( $sanitized == $username );
+ return apply_filters( 'validate_username', $valid, $username );
+}
+
+/**
+ * Insert an user into the database.
+ *
+ * Can update a current user or insert a new user based on whether the user's ID
+ * is present.
+ *
+ * Can be used to update the user's info (see below), set the user's role, and
+ * set the user's preference on whether they want the rich editor on.
+ *
+ * Most of the $userdata array fields have filters associated with the values.
+ * The exceptions are 'rich_editing', 'role', 'jabber', 'aim', 'yim',
+ * 'user_registered', and 'ID'. The filters have the prefix 'pre_user_' followed
+ * by the field name. An example using 'description' would have the filter
+ * called, 'pre_user_description' that can be hooked into.
+ *
+ * The $userdata array can contain the following fields:
+ * 'ID' - An integer that will be used for updating an existing user.
+ * 'user_pass' - A string that contains the plain text password for the user.
+ * 'user_login' - A string that contains the user's username for logging in.
+ * 'user_nicename' - A string that contains a nicer looking name for the user.
+ * The default is the user's username.
+ * 'user_url' - A string containing the user's URL for the user's web site.
+ * 'user_email' - A string containing the user's email address.
+ * 'display_name' - A string that will be shown on the site. Defaults to user's
+ * username. It is likely that you will want to change this, for both
+ * appearance and security through obscurity (that is if you don't use and
+ * delete the default 'admin' user).
+ * 'nickname' - The user's nickname, defaults to the user's username.
+ * 'first_name' - The user's first name.
+ * 'last_name' - The user's last name.
+ * 'description' - A string containing content about the user.
+ * 'rich_editing' - A string for whether to enable the rich editor. False
+ * if not empty.
+ * 'user_registered' - The date the user registered. Format is 'Y-m-d H:i:s'.
+ * 'role' - A string used to set the user's role.
+ * 'jabber' - User's Jabber account.
+ * 'aim' - User's AOL IM account.
+ * 'yim' - User's Yahoo IM account.
+ *
+ * @since 2.0.0
+ * @uses $wpdb WordPress database layer.
+ * @uses apply_filters() Calls filters for most of the $userdata fields with the prefix 'pre_user'. See note above.
+ * @uses do_action() Calls 'profile_update' hook when updating giving the user's ID
+ * @uses do_action() Calls 'user_register' hook when creating a new user giving the user's ID
+ *
+ * @param array $userdata An array of user data.
+ * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not be created.
+ */
+function wp_insert_user($userdata) {
+ global $wpdb;
+
+ extract($userdata, EXTR_SKIP);
+
+ // Are we updating or creating?
+ if ( !empty($ID) ) {
+ $ID = (int) $ID;
+ $update = true;
+ $old_user_data = get_userdata($ID);
+ } else {
+ $update = false;
+ // Hash the password
+ $user_pass = wp_hash_password($user_pass);
+ }
+
+ $user_login = sanitize_user($user_login, true);
+ $user_login = apply_filters('pre_user_login', $user_login);
+
+ //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.') );
+
+ if ( !$update && username_exists( $user_login ) )
+ return new WP_Error('existing_user_login', __('This username is already registered.') );
+
+ if ( empty($user_nicename) )
+ $user_nicename = sanitize_title( $user_login );
+ $user_nicename = apply_filters('pre_user_nicename', $user_nicename);
+
+ if ( empty($user_url) )
+ $user_url = '';
+ $user_url = apply_filters('pre_user_url', $user_url);
+
+ if ( empty($user_email) )
+ $user_email = '';
+ $user_email = apply_filters('pre_user_email', $user_email);
+
+ if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) )
+ return new WP_Error('existing_user_email', __('This email address is already registered.') );
+
+ if ( empty($display_name) )
+ $display_name = $user_login;
+ $display_name = apply_filters('pre_user_display_name', $display_name);
+
+ if ( empty($nickname) )
+ $nickname = $user_login;
+ $nickname = apply_filters('pre_user_nickname', $nickname);
+
+ if ( empty($first_name) )
+ $first_name = '';
+ $first_name = apply_filters('pre_user_first_name', $first_name);
+
+ if ( empty($last_name) )
+ $last_name = '';
+ $last_name = apply_filters('pre_user_last_name', $last_name);
+
+ if ( empty($description) )
+ $description = '';
+ $description = apply_filters('pre_user_description', $description);
+
+ if ( empty($rich_editing) )
+ $rich_editing = 'true';
+
+ if ( empty($comment_shortcuts) )
+ $comment_shortcuts = 'false';
+
+ if ( empty($admin_color) )
+ $admin_color = 'fresh';
+ $admin_color = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
+
+ if ( empty($use_ssl) )
+ $use_ssl = 0;
+
+ if ( empty($user_registered) )
+ $user_registered = gmdate('Y-m-d H:i:s');
+
+ $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));
+
+ if ( $user_nicename_check ) {
+ $suffix = 2;
+ while ($user_nicename_check) {
+ $alt_user_nicename = $user_nicename . "-$suffix";
+ $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
+ $suffix++;
+ }
+ $user_nicename = $alt_user_nicename;
+ }
+
+ $data = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
+ $data = stripslashes_deep( $data );
+
+ if ( $update ) {
+ $wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
+ $user_id = (int) $ID;
+ } else {
+ $wpdb->insert( $wpdb->users, $data + compact( 'user_login' ) );
+ $user_id = (int) $wpdb->insert_id;
+ }
+
+ 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);
+
+ $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 );
+ }
+
+ if ( isset($role) )
+ $user->set_role($role);
+ elseif ( !$update )
+ $user->set_role(get_option('default_role'));
+
+ wp_cache_delete($user_id, 'users');
+ wp_cache_delete($user_login, 'userlogins');
+
+ if ( $update )
+ do_action('profile_update', $user_id, $old_user_data);
+ else
+ do_action('user_register', $user_id);
+
+ return $user_id;
+}
+
+/**
+ * Update an user in the database.
+ *
+ * It is possible to update a user's password by specifying the 'user_pass'
+ * value in the $userdata parameter array.
+ *
+ * If $userdata does not contain an 'ID' key, then a new user will be created
+ * and the new user's ID will be returned.
+ *
+ * If current user's password is being updated, then the cookies will be
+ * cleared.
+ *
+ * @since 2.0.0
+ * @see wp_insert_user() For what fields can be set in $userdata
+ * @uses wp_insert_user() Used to update existing user or add new one if user doesn't exist already
+ *
+ * @param array $userdata An array of user data.
+ * @return int The updated user's ID.
+ */
+function wp_update_user($userdata) {
+ $ID = (int) $userdata['ID'];
+
+ // First, get all of the original fields
+ $user = get_userdata($ID);
+
+ // Escape data pulled from DB.
+ $user = add_magic_quotes(get_object_vars($user));
+
+ // If password is changing, hash it now.
+ if ( ! empty($userdata['user_pass']) ) {
+ $plaintext_pass = $userdata['user_pass'];
+ $userdata['user_pass'] = wp_hash_password($userdata['user_pass']);
+ }
+
+ wp_cache_delete($user[ 'user_email' ], 'useremail');
+
+ // Merge old and new fields with new fields overwriting old ones.
+ $userdata = array_merge($user, $userdata);
+ $user_id = wp_insert_user($userdata);
+
+ // Update the cookies if the password changed.
+ $current_user = wp_get_current_user();
+ if ( $current_user->id == $ID ) {
+ if ( isset($plaintext_pass) ) {
+ wp_clear_auth_cookie();
+ wp_set_auth_cookie($ID);
+ }
+ }
+
+ return $user_id;
+}
+
+/**
+ * A simpler way of inserting an user into the database.
+ *
+ * Creates a new user with just the username, password, and email. For a more
+ * detail creation of a user, use wp_insert_user() to specify more infomation.
+ *
+ * @since 2.0.0
+ * @see wp_insert_user() More complete way to create a new user
+ *
+ * @param string $username The user's username.
+ * @param string $password The user's password.
+ * @param string $email The user's email (optional).
+ * @return int The new user's ID.
+ */
+function wp_create_user($username, $password, $email = '') {
+ $user_login = esc_sql( $username );
+ $user_email = esc_sql( $email );
+ $user_pass = $password;
+
+ $userdata = compact('user_login', 'user_email', 'user_pass');
+ return wp_insert_user($userdata);
+}
+
+
+/**
+ * Set up the default contact methods
+ *
+ * @access private
+ * @since
+ *
+ * @param object $user User data object (optional)
+ * @return array $user_contactmethods Array of contact methods and their labels.
+ */
+function _wp_get_user_contactmethods( $user = null ) {
+ $user_contactmethods = array(
+ 'aim' => __('AIM'),
+ 'yim' => __('Yahoo IM'),
+ 'jabber' => __('Jabber / Google Talk')
+ );
+ return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-login.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -496,8 +496,6 @@
</span><span class="cx"> $user_login = '';
</span><span class="cx"> $user_email = '';
</span><span class="cx"> if ( $http_post ) {
</span><del>- require_once( ABSPATH . WPINC . '/registration.php');
-
</del><span class="cx"> $user_login = $_POST['user_login'];
</span><span class="cx"> $user_email = $_POST['user_email'];
</span><span class="cx"> $errors = register_new_user($user_login, $user_email);
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (16008 => 16009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-10-27 10:43:43 UTC (rev 16008)
+++ trunk/wp-signup.php 2010-10-27 10:46:24 UTC (rev 16009)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> add_action( 'wp_head', 'signuppageheaders' ) ;
</span><span class="cx">
</span><span class="cx"> require( './wp-blog-header.php' );
</span><del>-require_once( ABSPATH . WPINC . '/registration.php' );
</del><span class="cx">
</span><span class="cx"> if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
</span><span class="cx"> wp_redirect( network_home_url() );
</span></span></pre>
</div>
</div>
</body>
</html>