summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.htaccess2
-rw-r--r--.user.ini2
-rw-r--r--lib/private/util.php5
3 files changed, 6 insertions, 3 deletions
diff --git a/.htaccess b/.htaccess
index 0ec0fc0134f..844c1fda7f7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,7 +14,7 @@ php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1
php_value default_charset 'UTF-8'
-php_value output_buffering false
+php_value output_buffering off
<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
diff --git a/.user.ini b/.user.ini
index f59c3629455..66bf6484fe2 100644
--- a/.user.ini
+++ b/.user.ini
@@ -4,4 +4,4 @@ memory_limit=512M
mbstring.func_overload=0
always_populate_raw_post_data=-1
default_charset='UTF-8'
-output_buffering=false \ No newline at end of file
+output_buffering=off \ No newline at end of file
diff --git a/lib/private/util.php b/lib/private/util.php
index c4e137ea48e..652566be4bc 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -638,8 +638,11 @@ class OC_Util {
$webServerRestart = true;
}
foreach($invalidIniSettings as $setting) {
+ if(is_bool($setting[1])) {
+ $setting[1] = ($setting[1]) ? 'on' : 'off';
+ }
$errors[] = [
- 'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], $setting[1]]),
+ 'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
'hint' => $l->t('Adjusting this setting in php.ini will make ownCloud run again')
];
$webServerRestart = true;