do some commits

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

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 22a7fbac1977c56197d1e3b91f665b1e7871e7d6..159dab18a91015fb27d4e7be0b544b3ab9609b3e 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -23,18 +23,25 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class ProfilesettingsAction extends SettingsAction {
 
-       function show_form($msg=NULL, $success=false) {
-               $user = common_current_user();
-               $profile = $user->getProfile();
-               common_show_header(_t('Profile settings'), NULL, NULL, array($this, 'settings_menu'));
-
+       function show_top($arr) {
+               $msg = $arr[0];
+               $success = $arr[1];
                if ($msg) {
                        $this->message($msg, $success);
                } else {
                        common_element('div', 'instructions',
                                                   _t('You can update your personal profile info here '.
-                                                         'so people know more about you. '));
+                                                         'so people know more about you.'));
                }
+               $this->settings_menu();
+       }
+       
+       function show_form($msg=NULL, $success=false) {
+               $user = common_current_user();
+               $profile = $user->getProfile();
+               common_show_header(_t('Profile settings'), NULL, array($msg, $success),
+                                                  array($this, 'show_top'));
+
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'profilesettings',
                                                                                   'action' =>
@@ -112,7 +119,12 @@ class ProfilesettingsAction extends SettingsAction {
                $user->nickname = $nickname;
                $user->email = $email;
 
-               if (!$user->update($original)) {
+               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 (!$result) {
                        common_server_error(_t('Couldnt update user.'));
                        return;
                }
@@ -128,11 +140,17 @@ 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);
        }