diff --git a/actions/login.php b/actions/login.php index 293d07faed..c9d8873001 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 f1f4844d19..fc06c5a188 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; } diff --git a/doc/TODO b/doc/TODO index a7ee33ee50..4fd330461a 100644 --- a/doc/TODO +++ b/doc/TODO @@ -94,6 +94,8 @@ - receive notices from mobile phone - machine tags - release 0.5 +- Twitter-compatible API +- Pownce-compatible API - include twitter subscriptions - include Pownce subscriptions - privacy