Merge remote-tracking branch 'origin/master'

2015-03-03 11:33:26 +01:00 · 2015-03-03 11:33:26 +01:00 · f1a6d6017f
commit f1a6d6017f
parent cc3fd0af51 729cfb1836
1 changed files with 6 additions and 2 deletions
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@ -2472,9 +2472,13 @@ $cfg['DefaultLang'] = 'en';
 $cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';

 /**
- * Force: always use this language
- * $cfg['Lang'] = 'en';
+ * Force: always use this language, e.g. 'en'
 *
+ * @global string $cfg['Lang']
+ */
+$cfg['Lang'] = '';
+
+/**
 * Regular expression to limit listed languages, e.g. '^(cs|en)' for Czech and
 * English only
 *