GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

UNDO: move profile update to front

Browse Source 
darcs-hash:20080622164928-34904-04e381d2ac562a31fb3ed3dce300e2c2c456b0d7.gz
This commit is contained in:
Evan Prodromou 2008-06-22 12:49:28 -04:00
parent c1a5e54e67
commit 29014487d7
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
actions/profilesettings.php
View File

@ -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);