Ticket #14308: wp_insert_user.error-catch.14308.diff
File wp_insert_user.error-catch.14308.diff, 1.4 KB (added by , 15 years ago) |
---|
-
wp-includes/registration.php
278 278 $user_id = wp_insert_user($userdata); 279 279 280 280 // Update the cookies if the password changed. 281 $current_user = wp_get_current_user(); 282 if ( $current_user->id == $ID ) { 281 if ( get_current_user_id() == $ID ) { 283 282 if ( isset($plaintext_pass) ) { 284 283 wp_clear_auth_cookie(); 285 284 wp_set_auth_cookie($ID); 286 285 } 287 286 } 288 287 289 return $user_id;288 return ( is_wp_error( $user_id ) ? 0 : (int) $user_id ); 290 289 } 291 290 292 291 /** … … 309 308 $user_pass = $password; 310 309 311 310 $userdata = compact('user_login', 'user_email', 'user_pass'); 312 return wp_insert_user($userdata); 311 $user_id = wp_insert_user($userdata); 312 return ( is_wp_error( $user_id ) ? 0 : (int) $user_id ); 313 313 } 314 314 315 315 -
wp-admin/includes/user.php
183 183 $user_id = wp_update_user( get_object_vars( $user ) ); 184 184 } else { 185 185 $user_id = wp_insert_user( get_object_vars( $user ) ); 186 $user_id = is_wp_error( $user_id ) ? 0 : (int) $user_id; 186 187 wp_new_user_notification( $user_id, isset($_POST['send_password']) ? $pass1 : '' ); 187 188 } 188 189 return $user_id;