Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-01-17 05:56:12 +0400
committermattab <matthieu.aubry@gmail.com>2014-01-17 05:56:12 +0400
commitc3de64c4fe5794e108384ea76103a64e7badb1a0 (patch)
treee54df0d789de47d8e739a5c3ef9cda6171a27cf3
parentc6e5c1e0bf965f29dc4782c3b2fe456e652a7e62 (diff)
Trying to fix bug
http://forum.piwik.org/read.php?8,110075
-rw-r--r--core/Translate.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/Translate.php b/core/Translate.php
index 27570fb1cc..e0954b6fee 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -87,6 +87,9 @@ class Translate
if (!isset($GLOBALS['Piwik_translations'])) {
$GLOBALS['Piwik_translations'] = array();
}
+ if (empty($translation)) {
+ return;
+ }
// we could check that no string overlap here
$GLOBALS['Piwik_translations'] = array_replace_recursive($GLOBALS['Piwik_translations'], $translation);
}