Fix for bug #00019 (Linkified all @ addresses in a message)

[quix0rs-gnu-social.git] / actions / profilesettings.php

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 44abb8e99cf19c4451c7b898b5288211dc6fe30f..75e3758aba9da48900adbdf2967ed167cb13574f 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -112,17 +112,16 @@ class ProfilesettingsAction extends SettingsAction {
                $user = common_current_user();
                assert(!is_null($user)); # should already be checked
 
-               # FIXME: transaction!
-
+               $user->query('BEGIN');
+               
                $original = clone($user);
 
                $user->nickname = $nickname;
                $user->email = $email;
 
-               common_debug('Updating, nickname ="'.$user->nickname.'" and email ="'.$user->email.'"');
-               common_debug('Original, nickname ="'.$original->nickname.'" and email ="'.$original->email.'"');
+               $result = $user->update($original);
                
-               if (FALSE === $user->update($original)) {
+               if (!$result) {
                        common_server_error(_t('Couldnt update user.'));
                        return;
                }
@@ -138,12 +137,16 @@ class ProfilesettingsAction extends SettingsAction {
                $profile->location = $location;
                $profile->profileurl = common_profile_url($nickname);
 
-               if (FALSE === $profile->update($orig_profile)) {
+               $result = $profile->update($orig_profile);
+               
+               if (!$result) {
                        common_server_error(_t('Couldnt save profile.'));
                        return;
                }
 
                common_broadcast_profile($profile);
+
+               $user->query('COMMIT');
                
                $this->show_form(_t('Settings saved.'), TRUE);
        }