sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Use "off" and "off" instead of true booleans
remotes/origin/log-external-deletes
Thomas Müller 2015-02-23 11:12:53 +07:00
parent 9a08c7ecb9 43641d917b
commit f693d439e2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
Unescape Escape View File

@ -14,7 +14,7 @@ php_value memory_limit 512M
php_value mbstring.func_overload 0 php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1 php_value always_populate_raw_post_data -1
php_value default_charset 'UTF-8' php_value default_charset 'UTF-8'
php_value output_buffering false php_value output_buffering off
<IfModule mod_env.c> <IfModule mod_env.c>
SetEnv htaccessWorking true SetEnv htaccessWorking true
</IfModule> </IfModule>

2
.user.ini
Unescape Escape View File

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

5
lib/private/util.php
Unescape Escape View File

@ -638,8 +638,11 @@ class OC_Util {
$webServerRestart = true; $webServerRestart = true;
} }
foreach($invalidIniSettings as $setting) { foreach($invalidIniSettings as $setting) {
if(is_bool($setting[1])) {
$setting[1] = ($setting[1]) ? 'on' : 'off';
}
$errors[] = [ $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') 'hint' => $l->t('Adjusting this setting in php.ini will make ownCloud run again')
]; ];
$webServerRestart = true; $webServerRestart = true;