From f2b16fbaae3d9c3481be84846547987e3457e6f3 Mon Sep 17 00:00:00 2001 From: brettp Date: Sun, 24 Jan 2010 23:19:45 +0000 Subject: Correctly forwarding messages among multiple forwards (action_gatekeeper() -> index -> dashboard would drop messages generated in action_gatekeeper()). git-svn-id: http://code.elgg.org/elgg/trunk@3839 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index c171b75b2..074204310 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -25,9 +25,10 @@ function forward($location = "") { if (!headers_sent()) { $current_page = current_page_url(); - if (strpos($current_page, $CONFIG->wwwroot . "action") ===false) + // What is this meant to do? + //if (strpos($current_page, $CONFIG->wwwroot . "action") ===false) - $_SESSION['msg'] = system_messages(); + $_SESSION['msg'] = array_merge($_SESSION['msg'], system_messages()); if ((substr_count($location, 'http://') == 0) && (substr_count($location, 'https://') == 0)) { $location = $CONFIG->url . $location; } -- cgit v1.2.3