diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2020-04-24 16:29:19 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-04-24 16:29:19 +0200 |
| commit | dba40e58704a374755677ef1f24f6872a34bad80 (patch) | |
| tree | b240081d13a224da8d98f2794d6e53b6b8d26c35 /app/Controllers | |
| parent | 5fbbc6ad583308578e915e206f518c153949f51b (diff) | |
WebSub move fixes (#2922)
Small fixes related to when WebSub changes address:
* When unsubscribing, one must use the current/old address, not the
newly found selfUrl;
* This change
https://github.com/FreshRSS/FreshRSS/pull/2659#discussion_r347263068 was
wrong, so reverted to the first version. We must obey the rules also for
feeds for which the initial WebSub enabling is not finished, otherwise
we never have a chance to redirect the feed to the proper selfUrl.
Diffstat (limited to 'app/Controllers')
| -rwxr-xr-x | app/Controllers/feedController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 1f0d2d8ff..a2dcd360f 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -427,7 +427,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->commit(); } - if ($pubSubHubbubEnabled && $feed->hubUrl() && $feed->selfUrl()) { //selfUrl has priority for WebSub + if ($pubsubhubbubEnabledGeneral && $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) { |