diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-21 08:03:21 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-21 08:03:21 -0800 |
| commit | 4a2f9636cf567142f277b2691eb7c5df852313de (patch) | |
| tree | 40d1e1ec0355e4164ddfa06cf6f749d9dbb88409 /lib/base.php | |
| parent | 5d9731cef28d9c93e81216d31299b2b68fbc8758 (diff) | |
| parent | cd1cf58875ffacf427420d6dbe94d8718e4075e0 (diff) | |
| download | nextcloud-server-4a2f9636cf567142f277b2691eb7c5df852313de.tar.gz nextcloud-server-4a2f9636cf567142f277b2691eb7c5df852313de.zip | |
Merge pull request #5773 from owncloud/fix-2152-master
Make working en_US.UTF-8 locale a hard requirement
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/base.php b/lib/base.php index f3983a3800f..865d174d212 100644 --- a/lib/base.php +++ b/lib/base.php @@ -241,7 +241,7 @@ class OC { $minimizerCSS->clearCache(); $minimizerJS = new OC_Minimizer_JS(); $minimizerJS->clearCache(); - OC_Util::addscript('update'); + OC_Util::addScript('update'); $tmpl = new OC_Template('', 'update.admin', 'guest'); $tmpl->assign('version', OC_Util::getVersionString()); $tmpl->printPage(); @@ -559,12 +559,6 @@ class OC { } } - // write error into log if locale can't be set - if (OC_Util::isSetLocaleWorking() == false) { - OC_Log::write('core', - 'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system', - OC_Log::ERROR); - } if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) { if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { OC_Util::addScript('backgroundjobs'); |