Răsfoiți Sursa

Fix string condition
Follow-up of https://github.com/FreshRSS/FreshRSS/commit/33fd07f6f26310d4806077cc87bcdf9b8b940e35 , which should have been a PR

Alexandre Alapetite 1 an în urmă
părinte
comite
052261bb8e
2 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 1 1
      app/Models/Entry.php
  2. 3 1
      app/views/helpers/feed/update.phtml

+ 1 - 1
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);

+ 3 - 1
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>