From 6dbe33c51e83bbfc1e18c5bdf764411799502a99 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 29 Jul 2015 07:59:05 +0200 Subject: [PATCH 1/2] Don't hide errors in configuration Fix https://github.com/FreshRSS/FreshRSS/issues/920 --- lib/Minz/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { From a58bd1aa38c0bf2a5dcca5d2bb62d19a835546ec Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 29 Jul 2015 08:25:26 +0200 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68a9d0b73..74f4afc9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ * Fix broken links for extension script / style files. [#862](https://github.com/FreshRSS/FreshRSS/issues/862) * Load default configuration during installation to avoid hard-coded values. [#890](https://github.com/FreshRSS/FreshRSS/issues/890) * Fix non-consistent behaviour in Minz_Request::getBaseUrl() and introduce Minz_Request::guessBaseUrl(). [#906](https://github.com/FreshRSS/FreshRSS/issues/906) + * Don't hide errors in configuration. [#920](https://github.com/FreshRSS/FreshRSS/issues/920) ## 2015-05-31 FreshRSS 1.1.1 (beta)