aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2021-03-05 12:40:17 +0100
committerfilip <filip.komar@gmail.com>2021-03-05 12:40:17 +0100
commit88429aecc5df00951ece0358f5642861d39b2cfc (patch)
treeee31c41b15d6816b15aa26522190b195110fcd96
parent49d3a12db9043b8338c48c27f8deb6ceb456f9a1 (diff)
downloadwww-88429aecc5df00951ece0358f5642861d39b2cfc.tar
www-88429aecc5df00951ece0358f5642861d39b2cfc.tar.gz
www-88429aecc5df00951ece0358f5642861d39b2cfc.tar.bz2
www-88429aecc5df00951ece0358f5642861d39b2cfc.tar.xz
www-88429aecc5df00951ece0358f5642861d39b2cfc.zip
bugfix for preserving integers in dictionary
-rw-r--r--langs.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/langs.inc.php b/langs.inc.php
index a28b9775c..554d06cba 100644
--- a/langs.inc.php
+++ b/langs.inc.php
@@ -459,7 +459,7 @@ function read_translation_file($locale, $name_of_translation)
if(is_array($name_of_translation)) {
$dictionary = array();
foreach($name_of_translation as $single_filename) {
- $dictionary = array_merge($dictionary, read_translation_file($locale, $single_filename));
+ $dictionary = $dictionary + read_translation_file($locale, $single_filename);
}
return $dictionary;
} else {