diff options
author | Andrew Dolgov <[email protected]> | 2013-04-15 18:22:48 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-15 18:22:48 +0400 |
commit | bc7a144dd589302025c3b024d6da71f2e53d6496 (patch) | |
tree | 94b16695972e4476b4582b55a7a36936b1fd9d28 /classes | |
parent | 86f7d2a9f2b6468a34b20d7a26c7cfc3afbe00ee (diff) |
properly remove and replace favicon color when favicon gets manually removed/uploaded
Diffstat (limited to 'classes')
-rw-r--r-- | classes/pref/feeds.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index c57cccc44..c5d6245fe 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -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; } |