diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-03 13:10:08 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-03 13:10:08 +0000 |
| commit | 7049bad2caedaad3aa84de9ba1141943bcec9772 (patch) | |
| tree | 0a46717599189e2c9deaf63bdde751f7b6bddbf9 /engine | |
| parent | 61cf6daf4860276e4b39fbb7720f5dd520fba2ff (diff) | |
| download | elgg-7049bad2caedaad3aa84de9ba1141943bcec9772.tar.gz elgg-7049bad2caedaad3aa84de9ba1141943bcec9772.tar.bz2 | |
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
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/languages.php | 5 |
1 files changed, 4 insertions, 1 deletions
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;
|