Merge branch 'importOpmlTitles' of https://github.com/Alkarex/FreshRSS into Alkarex-importOpmlTitles

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 60e6d3358..41e95fc90 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -133,9 +133,15 @@ function getFeedsOutline ($outline, $cat_id) {
 
 function getFeed ($outline, $cat_id) {
 	$url = (string) $outline['xmlUrl'];
+	$title = '';
+	if (isset ($outline['text'])) {
+		$title = (string) $outline['text'];
+	} elseif (isset ($outline['title'])) {
+		$title = (string) $outline['title'];
+	}
 	$feed = new Feed ($url);
 	$feed->_category ($cat_id);
-
+	$feed->_name ($title);
 	return $feed;
 }