mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-31 12:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'marienfressinaud-920-white-page-bad-config' into dev

Browse Source
This commit is contained in:
Marien Fressinaud
2015-07-29 08:48:12 +02:00
parent e126b0add7 650b5e2721
commit de96459250
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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)

2
lib/Minz/Configuration.php
View File

@@ -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 {