aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-03 15:29:57 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-03 15:29:57 +0000
commit2f4f6f2128a97343cff1a40421782a6f0b1f035a (patch)
tree4745491e3a8a618c7cbcb8d7199b140c40225652 /engine
parent0069e3f6689b8d59b0d10958be71928afb6fa156 (diff)
downloadelgg-2f4f6f2128a97343cff1a40421782a6f0b1f035a.tar.gz
elgg-2f4f6f2128a97343cff1a40421782a6f0b1f035a.tar.bz2
Minor tweaks
git-svn-id: https://code.elgg.org/elgg/trunk@3037 36083f99-b078-4883-b0ff-0f9b5a30f544
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))