diff options
Diffstat (limited to 'app/Controllers')
| -rwxr-xr-x | app/Controllers/feedController.php | 10 | ||||
| -rw-r--r-- | app/Controllers/subscriptionController.php | 1 |
2 files changed, 6 insertions, 5 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()); diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 58cda4b9b..70065fc26 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -369,7 +369,6 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { } if ($favicon_uploaded && !$resetFavicon) { - require_once(LIB_PATH . '/favicons.php'); $max_size = FreshRSS_Context::systemConf()->limits['max_favicon_upload_size']; if ($favicon_size > $max_size) { Minz_Request::bad(_t('feedback.sub.feed.favicon.too_large', format_bytes($max_size)), $url_redirect); |