- 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;
+ $original = clone($user);
+
+ $user->nickname = $nickname;
+ $user->language = $language;
+ $user->timezone = $timezone;
+
+ $result = $user->updateKeys($original);
+
+ if ($result === FALSE) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ common_server_error(_('Couldn\'t update user.'));
+ return;
+ } else {
+ # Re-initialize language environment if it changed
+ common_init_language();
+ }
+ }
+
+ # XXX: XOR
+
+ if ($user->autosubscribe ^ $autosubscribe) {
+
+ $original = clone($user);
+
+ $user->autosubscribe = $autosubscribe;
+
+ $result = $user->update($original);
+
+ if ($result === FALSE) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ common_server_error(_('Couldn\'t update user for autosubscribe.'));
+ return;
+ }