From 6263c4160e6067c4074d349e67f990c6e8130ddf Mon Sep 17 00:00:00 2001 From: icewing Date: Mon, 3 Mar 2008 13:02:00 +0000 Subject: Fixed short circuit comparison git-svn-id: https://code.elgg.org/elgg/trunk@56 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine') diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 63ff62295..57b96e615 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -66,7 +66,7 @@ } // Load session and configuration variables - if (is_array($_SESSION) && isset($_SESSION)) { + if (isset($_SESSION) && is_array($_SESSION) ) { $vars = array_merge($vars, $_SESSION); } if (!empty($CONFIG)) -- cgit v1.2.3