From 12a6bd28ace16ff20f1f920831cffe1041b36d5c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 15 Apr 2013 17:07:06 +0400 Subject: [PATCH] remove hsl stuff from classes/feeds, we take care of this when choosing the color --- classes/feeds.php | 10 +--------- include/rssfuncs.php | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 81729aacc..6d15c99e8 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -408,15 +408,7 @@ class Feeds extends Handler_Protected { if ($fav_color) { if (!isset($rgba_cache[$feed_id])) { - $hsl = rgb2hsl(_color_unpack($fav_color)); - - if ($hsl[1] < 0.1) - $hsl[2] = 1; - else if ($hsl[2] < 0.25) - $hsl[2] = 0.25; - - $rgba_cache[$feed_id] = join(",", hsl2rgb($hsl)); - + $rgba_cache[$feed_id] = join(",", _color_unpack($fav_color)); } $rgba = $rgba_cache[$feed_id]; diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 0d55dce36..250534bd7 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -417,6 +417,8 @@ $favicon_color = db_escape_string($link, calculate_avg_color($favicon_file)); + if ($debug_enabled) _debug("color: $favicon_color"); + $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'"; }