remove hsl stuff from classes/feeds, we take care of this when choosing the color

diff --git a/classes/feeds.php b/classes/feeds.php
index 81729aacc60fa78571679e39aee2218203825154..6d15c99e8bc73dd133e3b7473cc373caeeec3a74 100644 (file)
--- 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 0d55dce36bf513f7a3737626bb4a03e0dcbd518e..250534bd745af8d18be21992399d75bba373e8a2 100644 (file)
--- 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."'";
                                }