mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-01-28 07:08:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

try/catch for finfo_open

Browse Source
This commit is contained in:
Alexandre Alapetite
2017-04-08 18:03:52 +02:00
parent 07a9faf851
commit fe494e000b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@
* Bug fixing
* Fix SQL uniqueness bug with PostgreSQL [#1476](https://github.com/FreshRSS/FreshRSS/pull/1476)
* (Require manual update for existing installations)
* Do not require PHP extension `fileinfo` for favicons [#1461](https://github.com/FreshRSS/FreshRSS/issues/1461)
* Fix UI lowest subscription popup hidden [#1479](https://github.com/FreshRSS/FreshRSS/issues/1479)
* I18n
* Improve English [#1465](https://github.com/FreshRSS/FreshRSS/pull/1465)

12
lib/Favicon/Favicon.php
View File

@@ -229,10 +229,14 @@ class Favicon
$fileContent = $this->dataAccess->retrieveUrl($url);
$this->dataAccess->saveCache($tmpFile, $fileContent);
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$isImage = strpos(finfo_file($finfo, $tmpFile), 'image') !== false;
finfo_close($finfo);
$isImage = true;
try {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$isImage = strpos(finfo_file($finfo, $tmpFile), 'image') !== false;
finfo_close($finfo);
} catch (Exception $e) {
}
unlink($tmpFile);
return $isImage;