From 4b656f47dff2bd6eed4dcfad060b8434d052d883 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Wed, 9 Jul 2008 18:46:30 -0400 Subject: Merge conflicts and kill a whole lot of trailing whitespace on lines. darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz --- actions/register.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actions/register.php') diff --git a/actions/register.php b/actions/register.php index 0ee332f0f..45446dce6 100644 --- a/actions/register.php +++ b/actions/register.php @@ -68,7 +68,7 @@ class RegisterAction extends Action { if (!$user) { $this->show_form(_t('Invalid username or password.')); return; - } + } # success! if (!common_set_user($user)) { common_server_error(_('Error setting user.')); @@ -82,7 +82,7 @@ class RegisterAction extends Action { } common_redirect(common_local_url('profilesettings')); } else { - $this->show_form(_t('Invalid username or password.')); + $this->show_form(_('Invalid username or password.')); } } -- cgit v1.2.3-54-g00ecf