summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-05 15:46:55 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-05 15:46:55 +0100
commitac11c842e67fe278c4b2178623ad63a5066fc898 (patch)
treeb5b481227e3d8493443743edcc8e9c8ce7f7b57d /lib
parentd8084c132ec411381519fe9dba2d235148692da4 (diff)
downloadnextcloud-server-ac11c842e67fe278c4b2178623ad63a5066fc898.tar.gz
nextcloud-server-ac11c842e67fe278c4b2178623ad63a5066fc898.zip
setlocale test is pointless on Windows
Diffstat (limited to 'lib')
-rwxr-xr-xlib/util.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/util.php b/lib/util.php
index c5ef4e3b6f4..4932be2d6cc 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -519,6 +519,11 @@ class OC_Util {
* Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server.
*/
public static function issetlocaleworking() {
+ // setlocale test is pointless on Windows
+ if (OC_Util::runningOnWindows() ) {
+ return true;
+ }
+
$result=setlocale(LC_ALL, 'en_US.UTF-8');
if($result==false) {
return(false);