From 43641d917bccf135092521ebc972d4b57d9fba09 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 23 Feb 2015 09:40:15 +0100 Subject: [PATCH] Use "off" and "off" instead of true booleans MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently a boolean in php.ini is according to the documentation "on" or "off"… Fixes itself. --- .htaccess | 2 +- .user.ini | 2 +- lib/private/util.php | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 0ec0fc0134..844c1fda7f 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 SetEnv htaccessWorking true diff --git a/.user.ini b/.user.ini index f59c362945..66bf6484fe 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 c4e137ea48..652566be4b 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;