diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
| commit | e008c037f53324b931f027483f9f1053171109c5 (patch) | |
| tree | 441c54eb946ffb53a161cad8f686ce7aff875abd /src/Wallabag/CoreBundle/Controller/RssController.php | |
| parent | 74f39b0952440fa0c55e5e8a2e1a8d2bbd3acfd7 (diff) | |
| parent | 79b9e49d9464e9a67f6ee66fbf6f6c541b1a29f4 (diff) | |
| download | wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.gz wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.zst wallabag-e008c037f53324b931f027483f9f1053171109c5.zip | |
Merge pull request #1612 from wallabag/v2-settings-page
Settings page
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/RssController.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 2b7ef598..a4f7a200 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
| @@ -84,7 +84,7 @@ class RssController extends Controller | |||
| 84 | $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); | 84 | $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); |
| 85 | $entries = new Pagerfanta($pagerAdapter); | 85 | $entries = new Pagerfanta($pagerAdapter); |
| 86 | 86 | ||
| 87 | $perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit'); | 87 | $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); |
| 88 | $entries->setMaxPerPage($perPage); | 88 | $entries->setMaxPerPage($perPage); |
| 89 | 89 | ||
| 90 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 90 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |