From 2f4f6f2128a97343cff1a40421782a6f0b1f035a Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 3 Mar 2009 15:29:57 +0000
Subject: Minor tweaks

git-svn-id: https://code.elgg.org/elgg/trunk@3037 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engine/lib/elgglib.php')

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))
-- 
cgit v1.2.3