From 0696890c06557770ba2ab4f101003c3e8bb95ccf Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 26 Aug 2013 01:47:14 +0200
Subject: Use feed names coming from OPML

Use the feed names (text or title) provided by OPML and do not overwrite
them during import.
---
 app/models/Feed.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/models')

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 ());
 
-- 
cgit v1.2.3