aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-03 16:33:57 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-03 16:33:57 +0000
commit9a6a29c5f8fd947e9fb015b5c557b15f23ec4d4a (patch)
treee0a2d134faf9728af0eebcbaa5e4258cd9753c5c /engine/lib
parentd1d265b45652b0c1d183b9d76cf659a22ea0815a (diff)
downloadelgg-9a6a29c5f8fd947e9fb015b5c557b15f23ec4d4a.tar.gz
elgg-9a6a29c5f8fd947e9fb015b5c557b15f23ec4d4a.tar.bz2
Using faster array concatination
git-svn-id: https://code.elgg.org/elgg/trunk@3043 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-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 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))