Merge branch 'master' of git.tt-rss.org:tt-rss/tt-rss

2023-02-25 19:31:07 +03:00
parent 4d825fa6a6 33c20d42df
commit 04c2fa9f15
7 changed files with 33 additions and 14 deletions
--- 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));
 	}