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:
authordiosmosis <benaka@piwik.pro>2015-04-09 06:36:22 +0300
committerdiosmosis <benaka@piwik.pro>2015-04-09 06:36:22 +0300
commit67829227ce2d0c4473466acbc42118a7a150b14c (patch)
tree973ebb1b5aa30d0b47a8d14ce73b7524a4051be0 /core/Translation
parent47e7d3a74c6b13431e489d2d652af53410f880ad (diff)
Added environment validation system test (mostly failing) that tests Piwik's behavior when INI files are gone or corrupt from each Piwik endpoint (tracker/reporting UI/console). Hacked test code to make it possible and for some tests to pass.
Diffstat (limited to 'core/Translation')
-rw-r--r--core/Translation/Translator.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Translation/Translator.php b/core/Translation/Translator.php
index dda946ccd9..46503a0185 100644
--- a/core/Translation/Translator.php
+++ b/core/Translation/Translator.php
@@ -114,7 +114,8 @@ class Translator
*/
public function getDefaultLanguage()
{
- return Config::getInstance()->General['default_language'];
+ $generalSection = Config::getInstance()->General;
+ return @$generalSection['default_language'] ?: 'en';
}
/**