aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2025-08-01 08:30:49 +0200
committerGravatar GitHub <noreply@github.com> 2025-08-01 08:30:49 +0200
commite915ebe46ecc76bd00e19a9cc63764ff2e277315 (patch)
tree4cb7caf3c8ad5328dab45097c3f92acabc621f5b /app/Controllers/feedController.php
parent188cc0d063b15be22cdd230b808c0bce5cff68e7 (diff)
Rework fetch favicons (#7767)
* Use main function `httpGet()` instead of local one; * Use HTTP cache, also between users; * Do not default to feed URL when there is no website URL TODO for later: consider supporting Atom's `<icon>` and RSS 2.0's `<image>` https://github.com/FreshRSS/FreshRSS/issues/7774
Diffstat (limited to 'app/Controllers/feedController.php')
-rwxr-xr-xapp/Controllers/feedController.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index a080d5e67..4cd5e7369 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -722,11 +722,13 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
$feed->_name($name);
$feedProperties['name'] = $feed->name(false);
}
- if (trim($feed->website()) === '') {
+ if ($feed->website() === '' || $feed->website() === $feed->url()) {
$website = html_only_entity_decode($simplePie->get_link());
- $feed->_website($website == '' ? $feed->url() : $website);
- $feedProperties['website'] = $feed->website();
- $feed->faviconPrepare();
+ if ($website !== $feed->website()) {
+ $feed->_website($website);
+ $feedProperties['website'] = $feed->website();
+ $feed->faviconPrepare();
+ }
}
if (trim($feed->description()) === '') {
$description = html_only_entity_decode($simplePie->get_description());