summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/functions.php3
-rw-r--r--include/rssfuncs.php10
2 files changed, 10 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php
index 46882c387..6372db1fd 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2602,6 +2602,9 @@
LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
}
+ if ($vfeed_query_part)
+ $vfeed_query_part .= "favicon_avg_color,";
+
$query = "SELECT DISTINCT
date_entered,
guid,
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bcc88dc2a..2e522175e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -416,9 +416,13 @@
require_once "colors.php";
- if (is_array($favicon_color))
- $favicon_colorstring = ",favicon_avg_color = '" .
- _color_pack(array_slice($favicon_color, 0, 3)) . "'";
+ if (is_array($favicon_color))
+ $tmp = array($favicon_color['red'],
+ $favicon_color['green'],
+ $favicon_color['blue']);
+
+ $favicon_colorstring = ",favicon_avg_color = '" .
+ _color_pack($tmp) . "'";
}
db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring