Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

Commit

Permalink
fix #969
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernhard Posselt committed Apr 11, 2016
1 parent 8d7f3f8 commit 7ed353d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions fetcher/feedfetcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ public function fetch($url, $getFavicon = true, $lastModified = null,
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) {
Expand All @@ -139,7 +139,7 @@ private function handleError(Exception $ex) {
$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) {
Expand Down

0 comments on commit 7ed353d

Please sign in to comment.