summaryrefslogtreecommitdiffstats
path: root/lib/setup.php
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-05-15 23:51:13 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2013-05-15 23:51:13 +0200
commit195f6143a3e5654418f28b5640df279fc81c8127 (patch)
tree3966312dfa60f4990547ebab62c9d40f0a88d3a6 /lib/setup.php
parent83444d9c641b77144cd74e5dc71c5ad18964944e (diff)
parentdfddaf8fbf5ff515f26ff462c7ba6166b3d0ed18 (diff)
downloadnextcloud-server-195f6143a3e5654418f28b5640df279fc81c8127.tar.gz
nextcloud-server-195f6143a3e5654418f28b5640df279fc81c8127.zip
Merge branch 'master' into convert-oc_config
Diffstat (limited to 'lib/setup.php')
-rw-r--r--lib/setup.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/setup.php b/lib/setup.php
index e05db554320..376b71fc03b 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -797,6 +797,7 @@ class OC_Setup {
$content.= "php_value upload_max_filesize 512M\n";//upload limit
$content.= "php_value post_max_size 512M\n";
$content.= "php_value memory_limit 512M\n";
+ $content.= "php_value mbstring.func_overload 0\n";
$content.= "<IfModule env_module>\n";
$content.= " SetEnv htaccessWorking true\n";
$content.= "</IfModule>\n";