From 2080f52cb1dd08b01b6af3bffc726b1db673f7f5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 19 May 2008 08:24:45 -0400 Subject: try to fix updating in profile darcs-hash:20080519122445-84dde-b6505e0b8ea310eee50eb6e638238fb7cf93bead.gz --- actions/login.php | 1 + actions/profilesettings.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'actions') 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; } -- cgit v1.2.3-54-g00ecf