summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/colors.php2
-rw-r--r--include/rssfuncs.php13
2 files changed, 7 insertions, 8 deletions
diff --git a/include/colors.php b/include/colors.php
index 19c891517..1359b9e2d 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -336,6 +336,6 @@ function hsl2rgb($arr) {
}
}
}
- return false;
+ return '';
}
?>
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 250534bd7..283e48532 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -412,17 +412,16 @@
$favicon_file = ICONS_DIR . "/$feed.ico";
if (file_exists($favicon_file)) {
- require_once "colors.php";
+ require_once "colors.php";
- $favicon_color = db_escape_string($link,
- calculate_avg_color($favicon_file));
+ $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."'";
+ $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
}
- db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
+ db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+ $favicon_colorstring
WHERE id = '$feed'");
}