From ab9a4e292cab48c94e6bac818f3256f6e131c041 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 10 Dec 2024 14:57:25 +0100 Subject: OPML export/import for cssFullContentConditions (#7082) Follow-up of https://github.com/FreshRSS/FreshRSS/commit/33fd07f6f26310d4806077cc87bcdf9b8b940e35, which should have been a PR. --- app/Services/ImportService.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'app/Services') diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 51ab106ca..b1cd7855a 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -180,8 +180,15 @@ class FreshRSS_Import_Service { $feed->_pathEntries(Minz_Helper::htmlspecialchars_utf8($feed_elt['frss:cssFullContent'])); } - if (isset($feed_elt['frss:cssFullContentFilter'])) { - $feed->_attribute('path_entries_filter', $feed_elt['frss:cssFullContentFilter']); + if (isset($feed_elt['frss:cssFullContentConditions'])) { + $feed->_attribute( + 'path_entries_conditions', + preg_split('/\R/u', $feed_elt['frss:cssFullContentConditions']) ?: [] + ); + } + + if (isset($feed_elt['frss:cssContentFilter']) || isset($feed_elt['frss:cssFullContentFilter'])) { + $feed->_attribute('path_entries_filter', $feed_elt['frss:cssContentFilter'] ?? $feed_elt['frss:cssFullContentFilter']); } if (isset($feed_elt['frss:filtersActionRead'])) { -- cgit v1.2.3