diff options
| author | Evan Prodromou <evan@controlezvous.ca> | 2008-06-22 12:49:28 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlezvous.ca> | 2008-06-22 12:49:28 -0400 |
| commit | 29014487d7651cee272794fe771ee467121ecea6 (patch) | |
| tree | 85220d9ac0d17a4b4c682b21ed757439ebf6c05c /actions | |
| parent | c1a5e54e67e56cea684d6011d8316d455aae28eb (diff) | |
UNDO: move profile update to front
darcs-hash:20080622164928-34904-04e381d2ac562a31fb3ed3dce300e2c2c456b0d7.gz
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/profilesettings.php | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php index ca17e2323..85e7bd19f 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -113,30 +113,6 @@ class ProfilesettingsAction extends SettingsAction { $user->query('BEGIN'); - $profile = $user->getProfile(); - - $orig_profile = clone($profile); - - $profile->nickname = $nickname; - $profile->fullname = $fullname; - $profile->homepage = $homepage; - $profile->bio = $bio; - $profile->location = $location; - $profile->profileurl = common_profile_url($nickname); - - common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__); - common_debug('New profile: ' . common_log_objstring($profile), __FILE__); - - $result = $profile->update($orig_profile); - - if (!$result) { - common_log_db_error($profile, 'UPDATE', __FILE__); - common_server_error(_t('Couldnt save profile.')); - return; - } - - # Keys don't update correctly, so we have to handle them separately - if (strcmp($user->nickname, $nickname) != 0) { common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname, @@ -184,6 +160,28 @@ class ProfilesettingsAction extends SettingsAction { $email); } + $profile = $user->getProfile(); + + $orig_profile = clone($profile); + + $profile->nickname = $user->nickname; + $profile->fullname = $fullname; + $profile->homepage = $homepage; + $profile->bio = $bio; + $profile->location = $location; + $profile->profileurl = common_profile_url($nickname); + + common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__); + common_debug('New profile: ' . common_log_objstring($profile), __FILE__); + + $result = $profile->update($orig_profile); + + if (!$result) { + common_log_db_error($profile, 'UPDATE', __FILE__); + common_server_error(_t('Couldnt save profile.')); + return; + } + $user->query('COMMIT'); common_broadcast_profile($profile); |