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 /app/Models/Feed.php | |
| parent | 961407b4e0546dd38a696a650898fcefbe2d6c8c (diff) | |
| parent | 67ca4a9ac610efc889dc7ca8f500b25a1cb3f378 (diff) | |
Merge pull request #1229 from Alkarex/PSHB-path
PSHB base_url bug
Diffstat (limited to 'app/Models/Feed.php')
| -rw-r--r-- | app/Models/Feed.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; |