diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Models/FeedDAO.php | 4 | ||||
| -rw-r--r-- | app/Services/ImportService.php | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index 233d2a715..1b3d84c46 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -83,7 +83,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable { 'url' => $feed->url(), 'kind' => $feed->kind(), 'category' => $feed->categoryId(), - 'name' => $feed->name(), + 'name' => $feed->name(true), 'website' => $feed->website(), 'description' => $feed->description(), 'lastUpdate' => 0, @@ -113,7 +113,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable { // Update some values of the existing feed using the import $values = [ 'kind' => $feed->kind(), - 'name' => $feed->name(), + 'name' => $feed->name(true), 'website' => $feed->website(), 'description' => $feed->description(), 'pathEntries' => $feed->pathEntries(), diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 2e70d4b81..4910e9cc4 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -123,6 +123,9 @@ class FreshRSS_Import_Service { * @return FreshRSS_Feed|null a feed. */ private function addFeedOpml($feed_elt, $parent_cat, $dryRun = false) { + if (empty($feed_elt['xmlUrl'])) { + return null; + } if ($parent_cat == null) { // This feed has no parent category so we get the default one $this->catDAO->checkDefault(); @@ -135,15 +138,9 @@ class FreshRSS_Import_Service { // We get different useful information $url = Minz_Helper::htmlspecialchars_utf8($feed_elt['xmlUrl']); - $name = Minz_Helper::htmlspecialchars_utf8($feed_elt['text']); - $website = ''; - if (isset($feed_elt['htmlUrl'])) { - $website = Minz_Helper::htmlspecialchars_utf8($feed_elt['htmlUrl']); - } - $description = ''; - if (isset($feed_elt['description'])) { - $description = Minz_Helper::htmlspecialchars_utf8($feed_elt['description']); - } + $name = Minz_Helper::htmlspecialchars_utf8($feed_elt['text'] ?? ''); + $website = Minz_Helper::htmlspecialchars_utf8($feed_elt['htmlUrl'] ?? ''); + $description = Minz_Helper::htmlspecialchars_utf8($feed_elt['description'] ?? ''); try { // Create a Feed object and add it in DB |