aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-03 16:26:58 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-03 16:26:58 +0000
commitf727bccef2f2a8a9dfe1fbbc43e3419e769c7de9 (patch)
treedcc957a38da4ff7c2c904a3d9a6c3b2ace8d57d1
parenta85a44570658cbd04f248d38941f31ec09f7e8fc (diff)
downloadelgg-f727bccef2f2a8a9dfe1fbbc43e3419e769c7de9.tar.gz
elgg-f727bccef2f2a8a9dfe1fbbc43e3419e769c7de9.tar.bz2
$vars is once again populated with session data
git-svn-id: https://code.elgg.org/elgg/trunk@3041 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/elgglib.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 2ae431790..9d1ec732b 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -281,7 +281,7 @@
// Load session and configuration variables into $vars
if (isset($_SESSION) /*&& is_array($_SESSION)*/ ) { // $_SESSION will always be an array if it is set
- array_merge($vars, $_SESSION);
+ $vars = array_merge($vars, $_SESSION);
}
$vars['config'] = array();
if (!empty($CONFIG))