Skip to content

Commit

Permalink
Fix OPML import special (FreshRSS#4708)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alkarex authored and math-GH committed Nov 15, 2022
1 parent 79400b7 commit c23f20d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/Models/FeedDAO.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function addFeedObject(FreshRSS_Feed $feed) {
// 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 = [
Expand Down

0 comments on commit c23f20d

Please sign in to comment.