try to improve color guessing algorithm a bit

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2e522175ecffd3e9ce0b08f804d1de93481103f0..0d55dce36bf513f7a3737626bb4a03e0dcbd518e 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -412,18 +412,13 @@
                                $favicon_file = ICONS_DIR . "/$feed.ico";
 
                                if (file_exists($favicon_file)) {
-                                           $favicon_color = calculate_avg_color($favicon_file);
-
                                                 require_once "colors.php";
 
-                                                if (is_array($favicon_color))
-                                                               $tmp = array($favicon_color['red'],
-                                                                       $favicon_color['green'],
-                                                                       $favicon_color['blue']);
+                                                $favicon_color = db_escape_string($link,
+                                                        calculate_avg_color($favicon_file));
 
-                                                                $favicon_colorstring = ",favicon_avg_color = '" .
-                                                               _color_pack($tmp) . "'";
-                }
+                                                $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
+                               }
 
                                db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
                                        WHERE id = '$feed'");