public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-04 17:09:17 +00:00
Code Issues Releases Wiki Activity

properly remove and replace favicon color when favicon gets manually removed/uploaded

Browse Source
This commit is contained in:
Andrew Dolgov
2013-04-15 18:22:48 +04:00
parent 86f7d2a9f2
commit bc7a144dd5
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/colors.php
View File

@@ -336,6 +336,6 @@ function hsl2rgb($arr) {
}
}
}
return false;
return '';
}
?>

13
include/rssfuncs.php
View File

@@ -412,17 +412,16 @@
$favicon_file = ICONS_DIR . "/$feed.ico";
if (file_exists($favicon_file)) {
require_once "colors.php";
require_once "colors.php";
$favicon_color = db_escape_string($link,
calculate_avg_color($favicon_file));
$favicon_color = db_escape_string($link,
calculate_avg_color($favicon_file));
if ($debug_enabled) _debug("color: $favicon_color");
$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
}
db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
$favicon_colorstring
WHERE id = '$feed'");
}