valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move rgb/hsl functions to their own namespace

This commit is contained in:
Andrew Dolgov 2021-02-16 17:07:23 +03:00
parent bdbbdbb0ed
commit 7fad6ce651
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/feeds.php
View File

@ -322,9 +322,9 @@ class Feeds extends Handler_Protected {
if (!isset($rgba_cache[$feed_id])) { if (!isset($rgba_cache[$feed_id])) {
if ($fav_color && $fav_color != 'fail') { if ($fav_color && $fav_color != 'fail') {
$rgba_cache[$feed_id] = _color_unpack($fav_color); $rgba_cache[$feed_id] = \Colors\_color_unpack($fav_color);
} else { } else {
$rgba_cache[$feed_id] = _color_unpack($this->_color_of($line['feed_title'])); $rgba_cache[$feed_id] = \Colors\_color_unpack($this->_color_of($line['feed_title']));
} }
} }

2
classes/rssutils.php
View File

@ -610,7 +610,7 @@ class RSSUtils {
id = ?"); id = ?");
$sth->execute([$feed]); $sth->execute([$feed]);
$favicon_color = calculate_avg_color($favicon_file); $favicon_color = \Colors\calculate_avg_color($favicon_file);
$favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color); $favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);

1
include/colors.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace Colors;
if (file_exists("lib/floIcon.php")) { if (file_exists("lib/floIcon.php")) {
require_once "lib/floIcon.php"; require_once "lib/floIcon.php";