aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/elgglib.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 8be1ec226..ecc0d0a49 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -280,8 +280,8 @@
}
// Load session and configuration variables into $vars
- if (isset($_SESSION) && is_array($_SESSION) ) {
- $vars = array_merge($vars, $_SESSION);
+ if (isset($_SESSION) /*&& is_array($_SESSION)*/ ) { // $_SESSION will always be an array if it is set
+ array_merge($vars, $_SESSION);
}
$vars['config'] = array();
if (!empty($CONFIG))