From 321d737a3d1b515327e322a3059b933d555eff86 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 5 Aug 2008 15:28:39 +0000 Subject: 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 --- engine/lib/elgglib.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'engine') diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 1bd9843f6..e2a599511 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -25,13 +25,18 @@ */ function forward($location = "") { - - if (!headers_sent()) { + global $CONFIG; + if (!headers_sent()) { + + $_SESSION['last_forward_from'] = current_page_url(); + $_SESSION['messages'] = system_messages(); - if (substr_count($location, 'http://') == 0) { - global $CONFIG; + if (substr_count($location, 'http://') == 0) { + $location = $CONFIG->url . $location; - } + } + + header("Location: {$location}"); exit; } @@ -56,7 +61,7 @@ if (($url['user']) || $url['pass']) $page .="@"; $page .= $url['host']; - $page = trim($page, "/"); $page.="/"; + $page = trim($page, "/"); //$page.="/"; $page .= $_SERVER['REQUEST_URI']; -- cgit v1.2.3