aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-03-03 13:02:00 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-03-03 13:02:00 +0000
commit6263c4160e6067c4074d349e67f990c6e8130ddf (patch)
tree146bde9b576f7d24df97b10800d9a0d67e5e8b6e
parentac719c217c81ab3af3cf9d8dea15bd845d912ed9 (diff)
downloadelgg-6263c4160e6067c4074d349e67f990c6e8130ddf.tar.gz
elgg-6263c4160e6067c4074d349e67f990c6e8130ddf.tar.bz2
Fixed short circuit comparison
git-svn-id: https://code.elgg.org/elgg/trunk@56 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 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))