add a placeholder where floicon might be added if needed, still keep it

off trunk re: author being a shitlord

1 files changed, 5 insertions, 2 deletions

diff --git a/include/colors.php b/include/colors.php
index 41bf7b819..91eaa2dc2 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once "lib/floIcon.php";
+if (file_exists("lib/floIcon.php")) {
+	require_once "lib/floIcon.php";
+}
 
 function _resolve_htmlcolor($color) {
 	$htmlcolors = array ("aliceblue" => "#f0f8ff",
@@ -286,7 +288,8 @@ function hsl2rgb($arr) {
 
 		$size = @getimagesize($imageFile);
 
-		if (!defined('_DISABLE_FLOICON') && strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+		if (strtolower($size['mime']) == 'image/vnd.microsoft.icon' && class_exists("floIcon")) {
+
 			$ico = new floIcon();
 			@$ico->readICO($imageFile);