From 9a6a29c5f8fd947e9fb015b5c557b15f23ec4d4a Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 3 Mar 2009 16:33:57 +0000
Subject: Using faster array concatination

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

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 9d1ec732b..ffa76d711 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -281,7 +281,7 @@
 		
 		// Load session and configuration variables into $vars
 		    if (isset($_SESSION) /*&& is_array($_SESSION)*/ ) { // $_SESSION will always be an array if it is set
-		        $vars = array_merge($vars, $_SESSION);
+		        $vars += $_SESSION; //= array_merge($vars, $_SESSION);
 		    }
 		    $vars['config'] = array();
 			if (!empty($CONFIG))
-- 
cgit v1.2.3