From 1a0f11ee3862d54b561185d9db3ff1f1a3947fff Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 28 Aug 2016 13:57:18 +0200 Subject: PSHB base_url bug https://github.com/FreshRSS/FreshRSS/issues/1227 Bug if base_url does not end with / --- app/Models/Feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3 From 67ca4a9ac610efc889dc7ca8f500b25a1cb3f378 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 28 Aug 2016 14:00:06 +0200 Subject: Changelog PSHB callback --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) 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) -- cgit v1.2.3