Merge pull request #466 from owncloud/fallback-url-feed

fallback to feed url if simplepie doesnt fetch a permanent link

1 files changed, 7 insertions, 1 deletions

diff --git a/fetcher/feedfetcher.php b/fetcher/feedfetcher.php
index 0476a9d3a..64ab73d68 100644
--- a/fetcher/feedfetcher.php
+++ b/fetcher/feedfetcher.php
@@ -196,7 +196,13 @@ class FeedFetcher implements IFeedFetcher {
 
 		$feed->setTitle($title);
 		$feed->setUrl($url);
-		$feed->setLink($simplePieFeed->get_permalink());
+
+		$link = $simplePieFeed->get_permalink();
+		if (!$link) {
+			$link = $url;
+		}
+		$feed->setLink($link);
+
 		$feed->setAdded($this->time->getTime());
 
 		if ($getFavicon) {