diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-28 14:39:55 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-08-28 14:39:55 +0200 |
| commit | 3d7231be57b5ed4d6f0690474419203117d0d717 (patch) | |
| tree | 1b998fd93f375a8f7634badbc51caf4dfef998d2 | |
| parent | 961407b4e0546dd38a696a650898fcefbe2d6c8c (diff) | |
| parent | 67ca4a9ac610efc889dc7ca8f500b25a1cb3f378 (diff) | |
Merge pull request #1229 from Alkarex/PSHB-path
PSHB base_url bug
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/Models/Feed.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f8fccae3f..93d3dcd3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ * Fixed JavaScript bug when articles were not always marked as read [#1123](https://github.com/FreshRSS/FreshRSS/issues/1123) * Fixed Apache Etag issue that prevented caching [#1199](https://github.com/FreshRSS/FreshRSS/pull/1199) * Fixed OPML import of categories [#1202](https://github.com/FreshRSS/FreshRSS/issues/1202) + * Fixed PubSubHubbub callback address bug on some configurations [1229](https://github.com/FreshRSS/FreshRSS/pull/1229) * UI * Use sticky category column [#1172](https://github.com/FreshRSS/FreshRSS/pull/1172) * Updated to jQuery 3.1.0 and several JavaScript fixes (e.g. drag & drop) [#1197](https://github.com/FreshRSS/FreshRSS/pull/1197) diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 986cc5015..9855ca742 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -446,7 +446,7 @@ class FreshRSS_Feed extends Minz_Model { Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url); return false; } - $callbackUrl = checkUrl(FreshRSS_Context::$system_conf->base_url . 'api/pshb.php?k=' . $hubJson['key']); + $callbackUrl = checkUrl(Minz_Request::getBaseUrl() . '/api/pshb.php?k=' . $hubJson['key']); if ($callbackUrl == '') { Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url); return false; |