diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 09:58:05 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 09:58:05 -0800 |
| commit | e68cf72458e9cfb888ef8b24d3e255fadf6d18a7 (patch) | |
| tree | ec3a231409c89bd74869226b785ecd4046a2b33a /lib/util.php | |
| parent | 2a650bcbe9d0875898d26a41864a6a80248e9826 (diff) | |
| parent | 232a98524cdc9c97ad1c5a72ec0021e4b036a69d (diff) | |
| download | nextcloud-server-e68cf72458e9cfb888ef8b24d3e255fadf6d18a7.tar.gz nextcloud-server-e68cf72458e9cfb888ef8b24d3e255fadf6d18a7.zip | |
Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
Diffstat (limited to 'lib/util.php')
| -rwxr-xr-x | lib/util.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/util.php b/lib/util.php index 49d914e5fbd..a5fe4cb175a 100755 --- a/lib/util.php +++ b/lib/util.php @@ -560,12 +560,11 @@ class OC_Util { return true; } - $result=setlocale(LC_ALL, 'en_US.UTF-8'); - if($result==false) { - return(false); - }else{ - return(true); - } + $result = setlocale(LC_ALL, 'en_US.UTF-8', 'en_US.UTF8'); + if($result == false) { + return false; + } + return true; } /** |