From 7049bad2caedaad3aa84de9ba1141943bcec9772 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 3 Mar 2009 13:10:08 +0000 Subject: Removing the stupidly slow array_merge from lang load code git-svn-id: https://code.elgg.org/elgg/trunk@3031 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/languages.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/lib/languages.php b/engine/lib/languages.php index 5f91aceec..575f3679b 100644 --- a/engine/lib/languages.php +++ b/engine/lib/languages.php @@ -38,7 +38,10 @@ if (!isset($CONFIG->translations[$country_code])) { $CONFIG->translations[$country_code] = $language_array; } else { - $CONFIG->translations[$country_code] = array_merge($CONFIG->translations[$country_code],$language_array); + //$CONFIG->translations[$country_code] = array_merge($CONFIG->translations[$country_code],$language_array); + $CONFIG->translations[$country_code] += $language_array; + //foreach ($language_array as $key => $value) + // $CONFIG->translations[$country_code][$key] = $value; } return true; -- cgit v1.2.3