### Eclipse Workspace Patch 1.0
#P wordpress-trunk
|
|
|
1543 | 1543 | * @return int The updated user's ID. |
1544 | 1544 | */ |
1545 | 1545 | function wp_update_user($userdata) { |
1546 | | $ID = (int) $userdata['ID']; |
| 1546 | // Retrieve data of existing user (if any) |
| 1547 | $user = array(); |
| 1548 | if ( empty( $userdata['ID'] ) ) { |
| 1549 | $ID = 0; |
| 1550 | } else { |
| 1551 | $ID = (int) $userdata['ID']; |
| 1552 | // First, get all of the original fields |
| 1553 | if ( $return = get_userdata($ID) ) { |
| 1554 | // Escape data pulled from DB. |
| 1555 | $user = add_magic_quotes(get_object_vars($return)); |
| 1556 | } |
| 1557 | unset( $return ); |
| 1558 | } |
1547 | 1559 | |
1548 | | // First, get all of the original fields |
1549 | | $user = get_userdata($ID); |
1550 | | |
1551 | | // Escape data pulled from DB. |
1552 | | $user = add_magic_quotes(get_object_vars($user)); |
1553 | | |
1554 | 1560 | // If password is changing, hash it now. |
1555 | | if ( ! empty($userdata['user_pass']) ) { |
| 1561 | if ( !empty($ID) && ! empty($userdata['user_pass']) ) { |
1556 | 1562 | $plaintext_pass = $userdata['user_pass']; |
1557 | 1563 | $userdata['user_pass'] = wp_hash_password($userdata['user_pass']); |
1558 | 1564 | } |