aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-24 23:19:45 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-24 23:19:45 +0000
commitf2b16fbaae3d9c3481be84846547987e3457e6f3 (patch)
tree493029c83c93c1c4b1734a265b8fec2600aded21 /engine/lib
parent607afe2fec078c0c0262e2d2d642082af9e15577 (diff)
downloadelgg-f2b16fbaae3d9c3481be84846547987e3457e6f3.tar.gz
elgg-f2b16fbaae3d9c3481be84846547987e3457e6f3.tar.bz2
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
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/elgglib.php5
1 files 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;
}