From c501b7b9259b6fc8c34655b870ce79f102ada137 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 30 May 2008 10:23:24 -0400 Subject: interim commit after pull from server darcs-hash:20080530142324-84dde-782c9f04f551447514f1557b9e80f8461a17771f.gz --- actions/login.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'actions/login.php') diff --git a/actions/login.php b/actions/login.php index 9f9c473b5..d25d59cf7 100644 --- a/actions/login.php +++ b/actions/login.php @@ -44,9 +44,16 @@ class LoginAction extends Action { return; } # success! - common_redirect(common_local_url('all', - array('nickname' => - $nickname))); + $url = common_get_returnto(); + if ($url) { + # We don't have to return to it again + common_set_returnto(NULL); + } else { + $url = common_local_url('all', + array('nickname' => + $nickname)); + } + common_redirect($url); } else { $this->show_form(_t('Incorrect username or password.')); } -- cgit v1.2.3-54-g00ecf