Fixes #5559 not clearing last_forward_from in session if login fails

diff --git a/actions/login.php b/actions/login.php
index 1e5e92ede37b9df7806cd5003a09758dee2d23e6..bd7f9129982d2b44a1e008501ebf9cc1122ccbd4 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -9,7 +9,6 @@
 // set forward url
 if (!empty($_SESSION['last_forward_from'])) {
        $forward_url = $_SESSION['last_forward_from'];
-       unset($_SESSION['last_forward_from']);
 } elseif (get_input('returntoreferer')) {
        $forward_url = REFERER;
 } else {
@@ -62,5 +61,9 @@ if ($user->language) {
        $message = elgg_echo('loginok');
 }
 
+if (isset($_SESSION['last_forward_from'])) {
+       unset($_SESSION['last_forward_from']);
+}
+
 system_message($message);
 forward($forward_url);