mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-07-19 19:42:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marien Fressinaud
2013-09-14 18:44:41 +02:00
parent 5072774f02 0696890c06
commit ec448c53a3
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/Feed.php
View File

@@ -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 ());

8
lib/lib_rss.php
View File

@@ -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;
}