From 72265c1eca41424f761246abc5a7fe84fd8bc0f9 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 9 Oct 2022 13:37:29 +0200 Subject: Fix OPML import special (#4708) #fix https://github.com/FreshRSS/FreshRSS/issues/4704 From https://github.com/FreshRSS/FreshRSS/pull/4407 --- app/Models/FeedDAO.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index 9f85fbc86..5993f50dc 100644 --- a/app/Models/FeedDAO.php +++ b/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 = [ -- cgit v1.2.3