diff options
| -rwxr-xr-x | app/Controllers/feedController.php | 2 | ||||
| -rw-r--r-- | app/Models/Feed.php | 6 |
2 files changed, 6 insertions, 2 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) { diff --git a/app/Models/Feed.php b/app/Models/Feed.php index c0bc90b2d..0fc92f0bd 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -695,7 +695,11 @@ class FreshRSS_Feed extends Minz_Model { //Parameter true to subscribe, false to unsubscribe. public function pubSubHubbubSubscribe($state) { - $url = $this->selfUrl ? $this->selfUrl : $this->url; + if ($state) { + $url = $this->selfUrl ? $this->selfUrl : $this->url; + } else { + $url = $this->url; //Always use current URL during unsubscribe + } if ($url && (Minz_Request::serverIsPublic(FreshRSS_Context::$system_conf->base_url) || !$state)) { $hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json'; $hubFile = @file_get_contents($hubFilename); |