summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-04-29 16:08:40 +0400
committerAndrew Dolgov <[email protected]>2013-04-29 16:09:03 +0400
commit258068b3793ff8b75cc1642d8fd77920ecb47a9c (patch)
treecb155fac67e61cf45bc437976c9db4c2936e3304 /classes
parente50920bbc0dabf7bc5a65500449e1c8239caf0bb (diff)
do not calculate favicon color on manual icon replace
Diffstat (limited to 'classes')
-rw-r--r--classes/pref/feeds.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ddfa56d01..e31725111 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -500,14 +500,8 @@ class Pref_Feeds extends Handler_Protected {
if ($this->dbh->num_rows($result) != 0) {
@unlink(ICONS_DIR . "/$feed_id.ico");
if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
-
- require_once "colors.php";
-
- $favicon_color = $this->dbh->escape_string(
- calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
-
$this->dbh->query("UPDATE ttrss_feeds SET
- favicon_avg_color = '$favicon_color'
+ favicon_avg_color = ''
WHERE id = '$feed_id'");
$rc = 0;