Browse Source

Fix OPML import special (#4708)

#fix https://github.com/FreshRSS/FreshRSS/issues/4704
From https://github.com/FreshRSS/FreshRSS/pull/4407
Alexandre Alapetite 3 years ago
parent
commit
72265c1eca
1 changed files with 1 additions and 1 deletions
  1. 1 1
      app/Models/FeedDAO.php

+ 1 - 1
app/Models/FeedDAO.php

@@ -111,7 +111,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 			// Merge existing and import attributes
 			$existingAttributes = $feed_search->attributes();
 			$importAttributes = $feed->attributes();
-			$feed->_attributes('', array_merge_recursive($existingAttributes, $importAttributes));
+			$feed->_attributes('', array_replace_recursive($existingAttributes, $importAttributes));
 
 			// Update some values of the existing feed using the import
 			$values = [