Merge pull request #14422 from owncloud/use-off-and-off

Use "off" and "off" instead of true booleans
This commit is contained in:
Thomas Müller 2015-02-23 11:12:53 +01:00
commit f693d439e2
3 changed files with 6 additions and 3 deletions

View File

@ -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>

View File

@ -4,4 +4,4 @@ memory_limit=512M
mbstring.func_overload=0
always_populate_raw_post_data=-1
default_charset='UTF-8'
output_buffering=false
output_buffering=off

View File

@ -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;