diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-03-06 18:09:12 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-03-06 18:09:12 +0100 |
| commit | a78ebd09654d8b126929b9a2b793b8ec740b0dc5 (patch) | |
| tree | b458394638c58421aa71b2ad8f4ca3af6e2140d3 | |
| parent | f6148e1f32548f98401de3676e07d3be5e7c5331 (diff) | |
| parent | 13936c57b0cbf4b037b6c2028dfacdfab67e0c95 (diff) | |
Merge pull request #1452 from Alkarex/Favicon-warning-fix
Fix Favicon library warning
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | lib/Favicon/Favicon.php | 3 |
2 files changed, 4 insertions, 1 deletions
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) 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]) ) { |