From 63c323f73610d81216801d1023dca724cfd32699 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 15 Apr 2013 15:17:12 +0400 Subject: only enable colored favicons in vfeeds; fix RGB triplet packing --- include/functions.php | 3 +++ include/rssfuncs.php | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'include') 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 -- cgit v1.2.3