Merge pull request #3799 from JediKev/issue/getPrimaryLanguage-nonobject

i18n: Fix getPrimaryLanguage() on non-object
osTicket · May 13, 2017 · 326845c · 326845c
2 parents afa31e9 + 1101fb2
commit 326845c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/class.i18n.php b/include/class.i18n.php
@@ -364,7 +364,7 @@ static function getDefaultLanguage() {
 
         return $lang = self::isLanguageInstalled($best_match_langcode)
             ? $best_match_langcode
-            : $cfg->getPrimaryLanguage();
+            : ($cfg ? $cfg->getPrimaryLanguage() : 'en_US');
     }
 
     static function getCurrentLanguage($user=false) {