Closes #196: Stores last forwarded page in session, this is used by logon to forward page to correct location.

Also fixed current_page_url() which was introducing a superfluous "/" before $_SERVER['REQUEST_URI']

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

1 files changed, 8 insertions, 1 deletions

diff --git a/actions/login.php b/actions/login.php
index 4d4f3c098..95c90ce7e 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -29,7 +29,14 @@
         

         if ($result) {

             system_message(elgg_echo('loginok'));

-            forward("pg/dashboard/");

+            if ($_SESSION['last_forward_from'])
+            {
+            	$forward_url = $_SESSION['last_forward_from'];
+            	$_SESSION['last_forward_from'] = "";
+            	forward($forward_url);
+            }
+            else
+            	forward("pg/dashboard/");

         } else {

             register_error(elgg_echo('loginerror'));

         }