From eba0bbe90e6e2a76ddeefd46d1c314aae64bac3f Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 18 Mar 2009 14:03:55 +0000 Subject: Closes #883: Using different operator logic so that plugins can replace existing translation entries. git-svn-id: https://code.elgg.org/elgg/trunk@3165 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/languages.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/engine/lib/languages.php b/engine/lib/languages.php index 71ed57bcf..6935a49bd 100644 --- a/engine/lib/languages.php +++ b/engine/lib/languages.php @@ -38,10 +38,7 @@ 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] += $language_array; - //foreach ($language_array as $key => $value) - // $CONFIG->translations[$country_code][$key] = $value; + $CONFIG->translations[$country_code] = $language_array += $CONFIG->translations[$country_code]; } return true; -- cgit v1.2.3