This commit is contained in:
Bernhard Posselt 2016-04-11 20:09:59 +02:00
Родитель 8d7f3f8c9f
Коммит 7ed353ded8
2 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -1,3 +1,6 @@
owncloud-news (8.3.1)
* **Bugfix**: Use the feed url when showing an example of a curl command if a feed does not exist, #969
owncloud-news (8.3.0)
* **Bugfix**: If two folders with the same name occur in a OPML file, merge them instead of simply ignoring the second one, #962
* **Enhancement**: Better error messages for SSL issues, #966

Просмотреть файл

@ -124,13 +124,13 @@ class FeedFetcher implements IFeedFetcher {
return [$feed, $items];
} catch (Exception $ex) {
$this->handleError($ex);
$this->handleError($ex, $url);
}
}
private function handleError(Exception $ex) {
private function handleError(Exception $ex, $url) {
$msg = $ex->getMessage();
if ($ex instanceof MalFormedXmlException) {
@ -139,7 +139,7 @@ class FeedFetcher implements IFeedFetcher {
$msg = $this->l10n->t('Feed not found: either the website ' .
'does not provide a feed or blocks access. To rule out ' .
'blocking, try to download the feed on your server\'s ' .
'command line using curl: curl http://the-feed.tld');
'command line using curl: curl ' . $url);
} else if ($ex instanceof UnsupportedFeedFormatException) {
$msg = $this->l10n->t('Detected feed format is not supported');
} else if ($ex instanceof InvalidCertificateException) {