public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:35:55 +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

18
classes/pref/feeds.php
View File

@@ -464,6 +464,9 @@ class Pref_Feeds extends Handler_Protected {
if (db_num_rows($result) != 0) {
@unlink(ICONS_DIR . "/$feed_id.ico");
db_query($this->link, "UPDATE ttrss_feeds SET favicon_avg_color = NULL
where id = '$feed_id'");
}
return;
@@ -498,8 +501,19 @@ class Pref_Feeds extends Handler_Protected {
if (db_num_rows($result) != 0) {
@unlink(ICONS_DIR . "/$feed_id.ico");
rename($icon_file, ICONS_DIR . "/$feed_id.ico");
$rc = 0;
if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
require_once "colors.php";
$favicon_color = db_escape_string($this->link,
calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
db_query($this->link, "UPDATE ttrss_feeds SET
favicon_avg_color = '$favicon_color'
WHERE id = '$feed_id'");
$rc = 0;
}
} else {
$rc = 2;
}