summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-19 08:24:45 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-19 08:24:45 -0400
commit2080f52cb1dd08b01b6af3bffc726b1db673f7f5 (patch)
treebae7d68af833e4845856225b099af128209d0ae7 /actions
parent88483fe3b839541d2cc22a1fb553307a1b759493 (diff)
try to fix updating in profile
darcs-hash:20080519122445-84dde-b6505e0b8ea310eee50eb6e638238fb7cf93bead.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/login.php1
-rw-r--r--actions/profilesettings.php4
2 files changed, 4 insertions, 1 deletions
diff --git a/actions/login.php b/actions/login.php
index 293d07fae..c9d887300 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -80,5 +80,6 @@ class LoginAction extends Action {
'id' => 'cancel',
'value' => _t('Cancel')));
common_element_end('form');
+ common_show_footer();
}
}
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index f1f4844d1..fc06c5a18 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -67,11 +67,13 @@ class ProfilesettingsAction extends SettingsAction {
# FIXME: scrub input
# FIXME: transaction!
+
+ $original = clone($user);
$user->nickname = $this->arg('nickname');
$user->email = $this->arg('email');
- if (!$user->update()) {
+ if (!$user->update($original)) {
common_server_error(_t('Couldnt update user.'));
return;
}