From fd7157e40ca32fb1bcda51f1aaf484cbb7988bdd Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 2 May 2024 20:36:08 +0200 Subject: CSS selector trim (#6428) fix https://github.com/FreshRSS/FreshRSS/pull/6426#issuecomment-2091159868 --- app/Models/Entry.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/Models/Entry.php') diff --git a/app/Models/Entry.php b/app/Models/Entry.php index 10b37aa94..ca8d9c602 100644 --- a/app/Models/Entry.php +++ b/app/Models/Entry.php @@ -749,11 +749,13 @@ HTML; $content = ''; $cssSelector = htmlspecialchars_decode($feed->pathEntries(), ENT_QUOTES); + $cssSelector = trim($cssSelector, ', '); $nodes = $xpath->query((new Gt\CssXPath\Translator($cssSelector))->asXPath()); if ($nodes != false) { - $path_entries_filter = $feed->attributeString('path_entries_filter'); + $path_entries_filter = $feed->attributeString('path_entries_filter') ?? ''; + $path_entries_filter = trim($path_entries_filter, ', '); foreach ($nodes as $node) { - if ($path_entries_filter != null) { + if ($path_entries_filter !== '') { $filterednodes = $xpath->query((new Gt\CssXPath\Translator($path_entries_filter))->asXPath(), $node) ?: []; foreach ($filterednodes as $filterednode) { if ($filterednode->parentNode === null) { -- cgit v1.2.3