Changeset 15896
- Timestamp:
- 10/21/2010 03:42:06 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/user.php
r15799 r15896 111 111 $user->description = trim( $_POST['description'] ); 112 112 113 foreach ( _wp_get_user_contactmethods( ) as $method => $name ) {113 foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) { 114 114 if ( isset( $_POST[$method] )) 115 115 $user->$method = sanitize_text_field( $_POST[$method] ); … … 225 225 $user = new WP_User( $user_id ); 226 226 227 $user_contactmethods = _wp_get_user_contactmethods( );227 $user_contactmethods = _wp_get_user_contactmethods( $user ); 228 228 foreach ($user_contactmethods as $method => $name) { 229 229 if ( empty( $user->{$method} ) ) -
trunk/wp-admin/user-edit.php
r15830 r15896 323 323 324 324 <?php 325 foreach (_wp_get_user_contactmethods( ) as $name => $desc) {325 foreach (_wp_get_user_contactmethods( $profileuser ) as $name => $desc) { 326 326 ?> 327 327 <tr> -
trunk/wp-includes/registration.php
r14504 r15896 212 212 update_user_meta( $user_id, 'use_ssl', $use_ssl); 213 213 214 foreach ( _wp_get_user_contactmethods() as $method => $name ) { 214 $user = new WP_User($user_id); 215 216 foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) { 215 217 if ( empty($$method) ) 216 218 $$method = ''; … … 219 221 } 220 222 221 if ( isset($role) ) { 222 $user = new WP_User($user_id); 223 if ( isset($role) ) 223 224 $user->set_role($role); 224 } elseif ( !$update ) { 225 $user = new WP_User($user_id); 225 elseif ( !$update ) 226 226 $user->set_role(get_option('default_role')); 227 }228 227 229 228 wp_cache_delete($user_id, 'users'); … … 320 319 * @since 321 320 * 321 * @param object $user User data object (optional) 322 322 * @return array $user_contactmethods Array of contact methods and their labels. 323 323 */ 324 function _wp_get_user_contactmethods( ) {324 function _wp_get_user_contactmethods( $user = null ) { 325 325 $user_contactmethods = array( 326 326 'aim' => __('AIM'), … … 328 328 'jabber' => __('Jabber / Google Talk') 329 329 ); 330 return apply_filters( 'user_contactmethods',$user_contactmethods);330 return apply_filters( 'user_contactmethods', $user_contactmethods, $user ); 331 331 } 332 332
Note: See TracChangeset
for help on using the changeset viewer.