tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix that an error is thrown when reading INI files without trailing newlines

This commit is contained in:
Johannes Meyer 2014-11-07 13:38:35 +01:00
parent 4537b2932e
commit 268569114c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Application/Config.php
View File

@ -401,7 +401,7 @@ class Config implements Countable, Iterator, ArrayAccess
$config->setConfigFile($file); $config->setConfigFile($file);
} elseif (is_readable($filepath)) { } elseif (is_readable($filepath)) {
$config->setConfigFile($filepath); $config->setConfigFile($filepath);
$config->merge(parse_ini_file($filepath, true, INI_SCANNER_RAW)); $config->merge(parse_ini_file($filepath, true));
} else { } else {
throw new NotReadableError(t('Cannot read config file "%s". Permission denied'), $filepath); throw new NotReadableError(t('Cannot read config file "%s". Permission denied'), $filepath);
} }