Correctly forwarding messages among multiple forwards (action_gatekeeper() -> index...

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

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index c171b75b2e226b4d81b55e7661b3375a6b44affc..074204310a49ed94105a1368b1f6de4d8461645d 100644 (file)
--- 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;
                }