public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-25 09:01:30 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
off trunk re: author being a shitlord
This commit is contained in:
Andrew Dolgov
2013-05-19 13:53:37 +04:00
parent 82852ecd33
commit a5eca88750
2 changed files with 5 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/colors.php
View File

@@ -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);