diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-10-09 13:37:29 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-10-09 13:37:29 +0200 |
| commit | 72265c1eca41424f761246abc5a7fe84fd8bc0f9 (patch) | |
| tree | 20daa778672f50dcd08610021bd37e3ce3e23b05 /app | |
| parent | e626fd249e9e1dbab229eb79850204dc83458880 (diff) | |
Fix OPML import special (#4708)
#fix https://github.com/FreshRSS/FreshRSS/issues/4704
From https://github.com/FreshRSS/FreshRSS/pull/4407
Diffstat (limited to 'app')
| -rw-r--r-- | app/Models/FeedDAO.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 = [ |