diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-07-29 08:48:12 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-07-29 08:48:12 +0200 |
| commit | de964592501a9742585966d1ddcb4b7df894efe6 (patch) | |
| tree | d3e906bc9c6c0fbd717cd750cafa0fd84ec2df6c | |
| parent | e126b0add7c00dc0ba56db35264d0138183c3604 (diff) | |
| parent | 650b5e27218cc1f3c723cd6c04078d8f90d14ec0 (diff) | |
Merge branch 'marienfressinaud-920-white-page-bad-config' into dev
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/Minz/Configuration.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c8356758a..f50b88060 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ * Generate `base_url` during the installation and add a `pubsubhubbub_enabled` configuration key. [#865](https://github.com/FreshRSS/FreshRSS/issues/865) * Load configuration by recursion to overwrite array values. [#923](https://github.com/FreshRSS/FreshRSS/issues/923) * Cast `$limits` configuration values in integer. [#925](https://github.com/FreshRSS/FreshRSS/issues/925) + * Don't hide errors in configuration. [#920](https://github.com/FreshRSS/FreshRSS/issues/920) ## 2015-05-31 FreshRSS 1.1.1 (beta) diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php index 1db8e2daf..d695d4a53 100644 --- a/lib/Minz/Configuration.php +++ b/lib/Minz/Configuration.php @@ -39,7 +39,7 @@ class Minz_Configuration { throw new Minz_FileNotExistException($filename); } - $data = @include($filename); + $data = include($filename); if (is_array($data)) { return $data; } else { |