Kaynağa Gözat

Fix favicons update (#4358)

Better update the favicons when the URL changes
Alexandre Alapetite 3 yıl önce
ebeveyn
işleme
7f0c378482
2 değiştirilmiş dosya ile 6 ekleme ve 3 silme
  1. 5 2
      app/Controllers/feedController.php
  2. 1 1
      app/Models/Feed.php

+ 5 - 2
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();
 					}
 				}
 			}

+ 1 - 1
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) {