diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-11-21 16:23:20 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-11-21 16:23:20 +0100 |
| commit | bb5d15f7c6133b17016407c0cbf9cce824285d0d (patch) | |
| tree | fda955be8b564cbdb53e049b6276b1743d1e1070 /app/Controllers/feedController.php | |
| parent | 2832babe409dde811ba8613649e83158b6ad0d70 (diff) | |
Do not obbey rel=self if WebSub is disabled (#2659)
* Do not obbey rel=self if WebSub is disabled
https://github.com/FreshRSS/FreshRSS/issues/2654
* Correct variable
https://github.com/FreshRSS/FreshRSS/pull/2659#discussion_r347552063
* Update app/Controllers/feedController.php
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index aabeb80ff..3eb2316b8 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -415,8 +415,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->commit(); } - if ($feed->hubUrl() && $feed->selfUrl()) { //selfUrl has priority for WebSub - if ($feed->selfUrl() !== $url) { //https://code.google.com/p/pubsubhubbub/wiki/MovingFeedsOrChangingHubs + if ($pubSubHubbubEnabled && $feed->hubUrl() && $feed->selfUrl()) { //selfUrl has priority for WebSub + if ($feed->selfUrl() !== $url) { // https://github.com/pubsubhubbub/PubSubHubbub/wiki/Moving-Feeds-or-changing-Hubs $selfUrl = checkUrl($feed->selfUrl()); if ($selfUrl) { Minz_Log::debug('WebSub unsubscribe ' . $feed->url(false)); |