From 7fad6ce6518469e7d99c496a39c03a36288efd11 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 17:07:23 +0300
Subject: move rgb/hsl functions to their own namespace

---
 include/colors.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/colors.php')

diff --git a/include/colors.php b/include/colors.php
index 408f5aa9d..a49c63076 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -1,4 +1,5 @@
 <?php
+namespace Colors;
 
 if (file_exists("lib/floIcon.php")) {
 	require_once "lib/floIcon.php";
-- 
cgit v1.2.3


From bf88c64d1e1983bf5fad4bae64914d248761ceb5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 18:14:57 +0300
Subject: fix floicon not imported from global namespace

---
 include/colors.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/colors.php')

diff --git a/include/colors.php b/include/colors.php
index a49c63076..41158f96e 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -298,7 +298,7 @@ function hsl2rgb($arr) {
 
 			if (class_exists("floIcon")) {
 
-				$ico = new floIcon();
+				$ico = new \floIcon();
 				@$ico->readICO($imageFile);
 
 				if(count($ico->images)==0)
-- 
cgit v1.2.3