Przeglądaj źródła

Fix favicon error in case of wrong URL (#6899)

fix https://github.com/FreshRSS/FreshRSS/issues/6898
Alexandre Alapetite 1 rok temu
rodzic
commit
1a9d24d0dd
1 zmienionych plików z 4 dodań i 3 usunięć
  1. 4 3
      lib/favicons.php

+ 4 - 3
lib/favicons.php

@@ -25,10 +25,11 @@ function isImgMime(string $content): bool {
 /** @param array<int,int|bool> $curlOptions */
 /** @param array<int,int|bool> $curlOptions */
 function downloadHttp(string &$url, array $curlOptions = []): string {
 function downloadHttp(string &$url, array $curlOptions = []): string {
 	syslog(LOG_INFO, 'FreshRSS Favicon GET ' . $url);
 	syslog(LOG_INFO, 'FreshRSS Favicon GET ' . $url);
-	$url = checkUrl($url);
-	if ($url == false) {
+	$url2 = checkUrl($url);
+	if ($url2 == false) {
 		return '';
 		return '';
 	}
 	}
+	$url = $url2;
 	/** @var CurlHandle $ch */
 	/** @var CurlHandle $ch */
 	$ch = curl_init($url);
 	$ch = curl_init($url);
 	curl_setopt_array($ch, [
 	curl_setopt_array($ch, [
@@ -56,7 +57,7 @@ function downloadHttp(string &$url, array $curlOptions = []): string {
 	curl_close($ch);
 	curl_close($ch);
 	if (!empty($info['url'])) {
 	if (!empty($info['url'])) {
 		$url2 = checkUrl($info['url']);
 		$url2 = checkUrl($info['url']);
-		if ($url2 != '') {
+		if ($url2 != false) {
 			$url = $url2;	//Possible redirect
 			$url = $url2;	//Possible redirect
 		}
 		}
 	}
 	}