diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-20 15:08:10 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-20 15:12:20 +0200 |
| commit | b96be346de62308321d1191c393c569bfa56094f (patch) | |
| tree | d82e31308b4402993ad7779389b1b7c716692b30 /program/lib/Roundcube/bootstrap.php | |
| parent | 2bc814eed5a5fd6cc90bd8b4b487e07a3ffbbe3b (diff) | |
Canonize boolean ini_get() results (#1489189)
Conflicts:
CHANGELOG
program/lib/Roundcube/rcube.php
Diffstat (limited to 'program/lib/Roundcube/bootstrap.php')
| -rw-r--r-- | program/lib/Roundcube/bootstrap.php | 3 |
1 files changed, 2 insertions, 1 deletions
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; |