]> source.dussan.org Git - nextcloud-server.git/commitdiff
Use "off" and "off" instead of true booleans
authorLukas Reschke <lukas@owncloud.com>
Mon, 23 Feb 2015 08:40:15 +0000 (09:40 +0100)
committerLukas Reschke <lukas@owncloud.com>
Mon, 23 Feb 2015 08:40:15 +0000 (09:40 +0100)
Apparently a boolean in php.ini is according to the documentation "on" or "off"…

Fixes itself.

.htaccess
.user.ini
lib/private/util.php

index 0ec0fc0134f61bc45804907c892187acd1d7e5aa..844c1fda7f74bc3ea65d6d93b34e13f3b2b69e35 100644 (file)
--- 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>
index f59c362945553a679af2f55d5f3012fb65120444..66bf6484fe2446eb562db490beff4804db3d99b1 100644 (file)
--- 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
index c4e137ea48e5c43577cec44c67a4401b01762c0f..652566be4bc64a56396482c905c36b25e5a6f17f 100644 (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;