diff options
| -rwxr-xr-x | lib/util.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/util.php b/lib/util.php index 363e3f105c0..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); @@ -677,4 +682,11 @@ class OC_Util { return $data; } + /** + * @return bool - well are we running on windows or not + */ + public static function runningOnWindows() { + return (substr(PHP_OS, 0, 3) === "WIN"); + } + } |