aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-12-10 13:59:56 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-12-10 13:59:56 +0100
commit052261bb8efbb910cefbf82fa54c64f54ba79854 (patch)
treebed801415d8c7f33f82791efd62b5030baeee0b6 /app
parent33fd07f6f26310d4806077cc87bcdf9b8b940e35 (diff)
Fix string condition
Follow-up of https://github.com/FreshRSS/FreshRSS/commit/33fd07f6f26310d4806077cc87bcdf9b8b940e35 , which should have been a PR
Diffstat (limited to 'app')
-rw-r--r--app/Models/Entry.php2
-rw-r--r--app/views/helpers/feed/update.phtml4
2 files changed, 4 insertions, 2 deletions
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 441730af2..adb208276 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -817,7 +817,7 @@ HTML;
if (!empty($feed->attributeArray('path_entries_condition'))) {
$found = false;
foreach ($feed->attributeArray('path_entries_condition') as $condition) {
- if (trim($condition) === '') {
+ if (!is_string($condition) || trim($condition) === '') {
continue;
}
$booleanSearch = new FreshRSS_BooleanSearch($condition);
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index f58d46d0f..c73987e50 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -667,7 +667,9 @@
<textarea class="w100" id="path_entries_condition" name="path_entries_condition"
rows="3" cols="64" spellcheck="false" placeholder="<?= _t('gen.short.blank_to_disable') ?>"><?php
foreach ($this->feed->attributeArray('path_entries_condition') ?? [] as $condition) {
- echo htmlspecialchars($condition, ENT_NOQUOTES, 'UTF-8'), PHP_EOL;
+ if (is_string($condition)) {
+ echo htmlspecialchars($condition, ENT_NOQUOTES, 'UTF-8'), PHP_EOL;
+ }
}
?></textarea>
<p class="help"><?= _i('help') ?> <?= _t('sub.feed.filteractions.help') ?></p>