aboutsummaryrefslogtreecommitdiff
path: root/app/models/Feed.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-08-26 01:47:14 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-08-26 01:47:14 +0200
commit0696890c06557770ba2ab4f101003c3e8bb95ccf (patch)
treed3f5dd3c150ea63e24b36f1cb6732a3f19a1acd5 /app/models/Feed.php
parent31a6a13268023a2db5eba2445ee6c7db4a6d9623 (diff)
Use feed names coming from OPML
Use the feed names (text or title) provided by OPML and do not overwrite them during import.
Diffstat (limited to 'app/models/Feed.php')
-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 678809af6..f714994e9 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 ());