valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jimIcon: hide GD warning

This commit is contained in:
Andrew Dolgov 2021-02-08 08:30:04 +03:00
parent 3f972f8fed
commit 479da5aa86
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/rssutils.php
View File

@ -595,9 +595,13 @@ class RSSUtils {
Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
user_error("before favicon", E_USER_WARNING);
self::check_feed_favicon($site_url, $feed);
$favicon_modified_new = file_exists($favicon_file) ? filemtime($favicon_file) : -1;
user_error("after favicon", E_USER_WARNING);
if ($favicon_modified_new > $favicon_modified)
$favicon_avg_color = '';

7
lib/jimIcon.php
View File

@ -104,7 +104,12 @@ class jimIcon {
}
// See if we can parse it (might be PNG format here)
$i = @imagecreatefromstring($data);
// (all this to hide one GD warning)
$er = error_reporting();
error_reporting(0);
$i = imagecreatefromstring($data);
error_reporting($er);
if ($i) {
imagesavealpha($i, true);
return $i;