From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 15 Jun 2013 09:15:20 +0000 (+0400)
Subject: do no try to pass MS icon files to GD
X-Git-Tag: 1.9~108
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a586afa37d0880df810cc9f9477dbb4280eabeb2;p=tt-rss.git

do no try to pass MS icon files to GD
---

diff --git a/include/colors.php b/include/colors.php
index 070be06a..491d38c1 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -288,15 +288,22 @@ function hsl2rgb($arr) {
 
 		$size = @getimagesize($imageFile);
 
-		if (strtolower($size['mime']) == 'image/vnd.microsoft.icon' && class_exists("floIcon")) {
+		// to enable .ico support place floIcon.php into lib/
+		if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
 
-			$ico = new floIcon();
-			@$ico->readICO($imageFile);
+			if (class_exists("floIcon")) {
 
-			if(count($ico->images)==0)
-				return null;
-			else
-				$img = @$ico->images[count($ico->images)-1]->getImageResource();
+				$ico = new floIcon();
+				@$ico->readICO($imageFile);
+
+				if(count($ico->images)==0)
+					return false;
+				else
+					$img = @$ico->images[count($ico->images)-1]->getImageResource();
+
+			} else {
+				return false;
+			}
 
 		} else if ($size[0] > 0 && $size[1] > 0) {
 		   $img = @imagecreatefromstring(file_get_contents($imageFile));