summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2023-02-25 19:31:07 +0300
committerAndrew Dolgov <[email protected]>2023-02-25 19:31:07 +0300
commit04c2fa9f156931cd4f7c3dcf468c110169f76459 (patch)
treeb7805f555f5620161cd2672a3b4e581c80529a1b /include
parent4d825fa6a698645dc588bde6ef5339e534b5f31c (diff)
parent33c20d42df10bb3cc2b6cc2801680418b537ac0e (diff)
Merge branch 'master' of git.tt-rss.org:tt-rss/tt-rss
Diffstat (limited to 'include')
-rw-r--r--include/colors.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/colors.php b/include/colors.php
index 5682b55a1..64e24f8f1 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -355,8 +355,9 @@ function colorPalette(string $imageFile, int $numColors, int $granularity = 5):
} else {
$img = @$ico->images[count($ico->images)-1]->getImageResource();
}
+ } else {
+ return null;
}
- return null;
} else if ($size[0] > 0 && $size[1] > 0) {
$img = @imagecreatefromstring(file_get_contents($imageFile));
}