From fc7265f1b87795e811b84d5ae45a640a3edf2f52 Mon Sep 17 00:00:00 2001 From: Christian Junk Date: Sun, 30 Jan 2022 18:11:18 +0100 Subject: [PATCH 1/2] Fixed wrong number of entries for tag feeds. --- src/Wallabag/CoreBundle/Controller/FeedController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php index fb9b24790..9ebfccf88 100644 --- a/src/Wallabag/CoreBundle/Controller/FeedController.php +++ b/src/Wallabag/CoreBundle/Controller/FeedController.php @@ -111,6 +111,9 @@ class FeedController extends Controller $pagerAdapter, $user ); + + $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit'); + $entries->setMaxPerPage($perPage); if (null === $entries) { throw $this->createNotFoundException('No entries found?'); From 4c724f26613083b71240699bb6fb1c2cb66cf133 Mon Sep 17 00:00:00 2001 From: Christian Junk Date: Mon, 31 Jan 2022 01:18:04 -0800 Subject: [PATCH 2/2] Fixed 'PHP-CS-Fixer.no_whitespace_in_blank_line'. --- src/Wallabag/CoreBundle/Controller/FeedController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php index 9ebfccf88..3a9634f9a 100644 --- a/src/Wallabag/CoreBundle/Controller/FeedController.php +++ b/src/Wallabag/CoreBundle/Controller/FeedController.php @@ -111,7 +111,7 @@ class FeedController extends Controller $pagerAdapter, $user ); - + $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit'); $entries->setMaxPerPage($perPage);