summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-07-25 09:53:25 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-07-25 09:53:25 +0200
commit07dc0b2fdf827a7583e8f29bc7a2a1568e070383 (patch)
treebe96e6eb268e64e8febefd7ca6f80f81f0a5f6cf /lib
parent3f58d949e012c68a01b9d4603c32244811196939 (diff)
downloadnextcloud-server-07dc0b2fdf827a7583e8f29bc7a2a1568e070383.tar.gz
nextcloud-server-07dc0b2fdf827a7583e8f29bc7a2a1568e070383.zip
setting and checking default_charset in php.ini to be UTF-8
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php3
-rwxr-xr-xlib/private/util.php7
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index 730cee5231d..95f6482e611 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -472,6 +472,9 @@ class OC {
@ini_set('post_max_size', '10G');
@ini_set('file_uploads', '50');
+ // setting charset to UTF8
+ @ini_set('default_charset', 'UTF-8');
+
self::handleAuthHeaders();
self::initPaths();
diff --git a/lib/private/util.php b/lib/private/util.php
index eea194288f9..ec5b2740ae8 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1447,4 +1447,11 @@ class OC_Util {
return false;
}
}
+
+ /**
+ * @return string
+ */
+ public static function isPhpCharSetUtf8() {
+ return ini_get('default_charset') === 'UTF-8';
+ }
}