From 7f0c378482e81972e448bfbce1ae44ffd5935501 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 13 May 2022 23:14:09 +0200
Subject: Fix favicons update (#4358)

Better update the favicons when the URL changes
---
 app/Controllers/feedController.php | 7 +++++--
 app/Models/Feed.php                | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 758f39c88..4788f9639 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -540,12 +540,15 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
 				}
 				if (trim($feed->website()) == '') {
 					$website = html_only_entity_decode($simplePie->get_link());
-					$feedProperties['website'] = $website == '' ? $feed->url() : $website;
+					$feed->_website($website == '' ? $feed->url() : $website);
+					$feedProperties['website'] = $feed->website();
+					$feed->faviconPrepare();
 				}
 				if (trim($feed->description()) == '') {
 					$description = html_only_entity_decode($simplePie->get_description());
 					if ($description != '') {
-						$feedProperties['description'] = $description;
+						$feed->_description($description);
+						$feedProperties['description'] = $feed->description();
 					}
 				}
 			}
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index b5b6fdfd8..b3692acbe 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -208,7 +208,7 @@ class FreshRSS_Feed extends Minz_Model {
 			$url = $this->url;
 		}
 		$txt = FAVICONS_DIR . $this->hash() . '.txt';
-		if (!file_exists($txt)) {
+		if (@file_get_contents($txt) !== $url) {
 			file_put_contents($txt, $url);
 		}
 		if (FreshRSS_Context::$isCli) {
-- 
cgit v1.2.3