Changeset 15896

Timestamp:

10/21/2010 03:42:06 PM (16 years ago)

Author:

nacin

Message:

Pass user object through _wp_get_user_contactmethods() to the user_contactmethods filter. props aaroncampbell, fixes #15186.

Location:

trunk

Files:

• wp-admin/includes/user.php (modified) (2 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/registration.php (modified) (4 diffs)

trunk/wp-admin/includes/user.php

@@ -111 +111 @@
                 $user->description = trim( $_POST['description'] );
 
-        foreach ( _wp_get_user_contactmethods() as $method => $name ) {
+        foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
                 if ( isset( $_POST[$method] ))
                         $user->$method = sanitize_text_field( $_POST[$method] );
@@ -225 +225 @@
         $user = new WP_User( $user_id );
 
-        $user_contactmethods = _wp_get_user_contactmethods();
+        $user_contactmethods = _wp_get_user_contactmethods( $user );
         foreach ($user_contactmethods as $method => $name) {
                 if ( empty( $user->{$method} ) )

trunk/wp-admin/user-edit.php

@@ -323 +323 @@
 
 <?php
-        foreach (_wp_get_user_contactmethods() as $name => $desc) {
+        foreach (_wp_get_user_contactmethods( $profileuser ) as $name => $desc) {
 ?>
 <tr>

trunk/wp-includes/registration.php

@@ -212 +212 @@
         update_user_meta( $user_id, 'use_ssl', $use_ssl);
 
-        foreach ( _wp_get_user_contactmethods() as $method => $name ) {
+        $user = new WP_User($user_id);
+
+        foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
                 if ( empty($$method) )
                         $$method = '';
@@ -219 +221 @@
         }
 
-        if ( isset($role) ) {
-                $user = new WP_User($user_id);
+        if ( isset($role) )
                 $user->set_role($role);
-        } elseif ( !$update ) {
-                $user = new WP_User($user_id);
+        elseif ( !$update )
                 $user->set_role(get_option('default_role'));
-        }
 
         wp_cache_delete($user_id, 'users');
@@ -320 +319 @@
  * @since
  *
+ * @param object $user User data object (optional)
  * @return array $user_contactmethods Array of contact methods and their labels.
  */
-function _wp_get_user_contactmethods() {
+function _wp_get_user_contactmethods( $user = null ) {
         $user_contactmethods = array(
                 'aim' => __('AIM'),
@@ -328 +328 @@
                 'jabber' => __('Jabber / Google Talk')
         );
-        return apply_filters('user_contactmethods',$user_contactmethods);
+        return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
 }