diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 11:12:53 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 11:12:53 +0100 |
| commit | f693d439e24c1d59c0de2347d6c9888c852cfafe (patch) | |
| tree | 2b63d6d83b8ccea6f795c27c1a72f12f7d2d8550 | |
| parent | 9a08c7ecb966414475d5a37da44119b7b0794c48 (diff) | |
| parent | 43641d917bccf135092521ebc972d4b57d9fba09 (diff) | |
| download | nextcloud-server-f693d439e24c1d59c0de2347d6c9888c852cfafe.tar.gz nextcloud-server-f693d439e24c1d59c0de2347d6c9888c852cfafe.zip | |
Merge pull request #14422 from owncloud/use-off-and-off
Use "off" and "off" instead of true booleans
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | .user.ini | 2 | ||||
| -rw-r--r-- | lib/private/util.php | 5 |
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; |