summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-09-14 18:44:41 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-09-14 18:44:41 +0200
commitec448c53a39ea5ca58f16cc5aab92e1576f042d7 (patch)
treeefd2c53b97dd290682e4d16c713499a25894bb08 /app/models
parent5072774f02a7aa8a5743d749fd8db516d6da8a79 (diff)
parent0696890c06557770ba2ab4f101003c3e8bb95ccf (diff)
Merge branch 'importOpmlTitles' of https://github.com/Alkarex/FreshRSS into Alkarex-importOpmlTitles
Diffstat (limited to 'app/models')
-rw-r--r--app/models/Feed.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/Feed.php b/app/models/Feed.php
index 1b380136e..3601ed1f8 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -200,8 +200,10 @@ class Feed extends Model {
}
$this->_url ($subscribe_url);
}
+ if (empty($this->name)) { // May come from OPML
$title = $feed->get_title ();
$this->_name (!is_null ($title) ? $title : $this->url);
+ }
$this->_website ($feed->get_link ());
$this->_description ($feed->get_description ());