Fixes #3036 moved setting of forward url to before login in case session variables...

git-svn-id: http://code.elgg.org/elgg/trunk@8567 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/login.php b/actions/login.php
index 1b4fbe1fdf6516f92c406943417f13eecdd85391..5934d1423fadbce6d3a9615fce754e3323d151e7 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -6,6 +6,17 @@
  * @subpackage User.Authentication
  */
 
+// set forward url
+if (isset($_SESSION['last_forward_from']) && $_SESSION['last_forward_from']) {
+       $forward_url = $_SESSION['last_forward_from'];
+       unset($_SESSION['last_forward_from']);
+} elseif (get_input('returntoreferer')) {
+       $forward_url = REFERER;
+} else {
+       // forward to main index page
+       $forward_url = '';
+}
+
 $username = get_input('username');
 $password = get_input("password");
 $persistent = get_input("persistent", FALSE);
@@ -41,16 +52,5 @@ try {
        forward(REFERER);
 }
 
-// forward to correct page
-if (isset($_SESSION['last_forward_from']) && $_SESSION['last_forward_from']) {
-       $forward_url = $_SESSION['last_forward_from'];
-       unset($_SESSION['last_forward_from']);
-} elseif (get_input('returntoreferer')) {
-       $forward_url = REFERER;
-} else {
-       // forward to main index page
-       $forward_url = '';
-}
-
 system_message(elgg_echo('loginok'));
 forward($forward_url);