|
|
@ -241,7 +241,7 @@ class FreshRSS_Feed extends Minz_Model { |
|
|
|
|
|
|
|
|
|
|
|
if ((!$mtime) || $feed->error()) { |
|
|
|
if ((!$mtime) || $feed->error()) { |
|
|
|
$errorMessage = $feed->error(); |
|
|
|
$errorMessage = $feed->error(); |
|
|
|
throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Feed error' : $errorMessage) . ' [' . $url . ']'); |
|
|
|
throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Unknown error for feed' : $errorMessage) . ' [' . $url . ']'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$links = $feed->get_links('self'); |
|
|
|
$links = $feed->get_links('self'); |
|
|
@ -446,7 +446,7 @@ class FreshRSS_Feed extends Minz_Model { |
|
|
|
Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url); |
|
|
|
Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url); |
|
|
|
return false; |
|
|
|
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 == '') { |
|
|
|
if ($callbackUrl == '') { |
|
|
|
Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url); |
|
|
|
Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url); |
|
|
|
return false; |
|
|
|
return false; |
|
|
|