From 6102489d579293a837e29c0056db887ac0c170ca Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 5 Mar 2017 01:05:42 +0100 Subject: [PATCH 1/2] Fix Favicon library warning https://github.com/Alkarex/FreshRSS/commit/59dfc64512372eaba7609d84500d943bb7274399 https://github.com/FreshRSS/FreshRSS/issues/1445#issuecomment-284176492 --- lib/Favicon/Favicon.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Favicon/Favicon.php b/lib/Favicon/Favicon.php index 1912050d6..8571a1b95 100644 --- a/lib/Favicon/Favicon.php +++ b/lib/Favicon/Favicon.php @@ -89,6 +89,9 @@ class Favicon $loop = TRUE; while ($loop && $max_loop-- > 0) { $headers = $this->dataAccess->retrieveHeader($url); + if (empty($headers)) { + return false; + } $exploded = explode(' ', $headers[0]); if( !isset($exploded[1]) ) { From 13936c57b0cbf4b037b6c2028dfacdfab67e0c95 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 5 Mar 2017 01:12:11 +0100 Subject: [PATCH 2/2] Changelog 1452 https://github.com/FreshRSS/FreshRSS/pull/1452 https://github.com/FreshRSS/FreshRSS/commit/59dfc64512372eaba7609d84500d943bb7274399 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd58eb0f5..a17692574 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ * Allow empty strings in CLI do-install [#1435](https://github.com/FreshRSS/FreshRSS/pull/1435) * Fix PostgreSQL bugs with API and feed modifications [#1417](https://github.com/FreshRSS/FreshRSS/pull/1417) * Do not mark as read in anonymous mode [#1431](https://github.com/FreshRSS/FreshRSS/issues/1431) - * Fix Favicons warning [#59dfc64](https://github.com/FreshRSS/FreshRSS/pull/1447/commits/59dfc64512372eaba7609d84500d943bb7274399) + * Fix Favicons warnings [#59dfc64](https://github.com/FreshRSS/FreshRSS/commit/59dfc64512372eaba7609d84500d943bb7274399), [#1452](https://github.com/FreshRSS/FreshRSS/pull/1452) * Security * Sanitize feed Web site URL [#1434](https://github.com/FreshRSS/FreshRSS/issues/1434) * No version number for anonymous users [#1404](https://github.com/FreshRSS/FreshRSS/issues/1404)