From 656b61ff2956351538cc70fe79cc534b1eb58e0c Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 1 Apr 2020 02:09:08 +0200 Subject: Fix fetch content for complex HEAD (#2867) * Fix contentSelectorPreviewAction Was not compatible with https://github.com/FreshRSS/FreshRSS/pull/2588 * Fix lib_phpQuery for #fix https://github.com/FreshRSS/FreshRSS/issues/2864 * Replace split() by explode() for PHP7 compatibility https://php.net/str-split * Fix for document with a `` tag more complicated, like `` --- app/Controllers/feedController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'app/Controllers/feedController.php') diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 38aa09223..43a6b7287 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -753,14 +753,20 @@ class FreshRSS_feed_Controller extends Minz_ActionController { //Check Feed ID validity. $entryDAO = FreshRSS_Factory::createEntryDao(); $entries = $entryDAO->listWhere('f', $feed_id); + $entry = null; - if (empty($entries)) { + //Get first entry (syntax robust for Generator or Array) + foreach ($entries as $myEntry) { + $entry = $myEntry; + break; + } + + if ($entry == null) { $this->view->fatalError = _t('feedback.sub.feed.selector_preview.no_entries'); return; } - //Get feed & entry. - $entry = $entries[0]; + //Get feed. $feed = $entry->feed(true); if (!$feed) { -- cgit v1.2.3