From b96be346de62308321d1191c393c569bfa56094f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 20 Jun 2013 15:08:10 +0200 Subject: Canonize boolean ini_get() results (#1489189) Conflicts: CHANGELOG program/lib/Roundcube/rcube.php --- program/lib/Roundcube/bootstrap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'program/lib/Roundcube/bootstrap.php') diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index db61dc21f..b659955c8 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -45,7 +45,8 @@ if (php_sapi_name() != 'cli') { } foreach ($config as $optname => $optval) { - if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) { + $ini_optval = filter_var(ini_get($optname), FILTER_VALIDATE_BOOLEAN); + if ($optval != $ini_optval && @ini_set($optname, $optval) === false) { $error = "ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n" . "Check your PHP configuration (including php_admin_flag)."; if (defined('STDERR')) fwrite(STDERR, $error); else echo $error; -- cgit v1.2.3