diff options
author | Jeremy <jeremy.benoist@gmail.com> | 2015-03-28 21:43:49 +0100 |
---|---|---|
committer | Jeremy <jeremy.benoist@gmail.com> | 2015-03-31 22:48:00 +0200 |
commit | 371ac69a6bd6325929e4efee7958682a6b1666f7 (patch) | |
tree | 781e6aa505f3c163e8385a662e1befc2f38885a3 /src/Wallabag/CoreBundle/Controller | |
parent | 2385f891e5992e84501d4cd47565a7bf0af14331 (diff) | |
download | wallabag-371ac69a6bd6325929e4efee7958682a6b1666f7.tar.gz wallabag-371ac69a6bd6325929e4efee7958682a6b1666f7.tar.zst wallabag-371ac69a6bd6325929e4efee7958682a6b1666f7.zip |
Add tests
and fix few mistakes
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 1622f348..dbae3ea7 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -107,7 +107,7 @@ class ConfigController extends Controller | |||
107 | $config = new Config($newUser); | 107 | $config = new Config($newUser); |
108 | $config->setTheme($this->container->getParameter('theme')); | 108 | $config->setTheme($this->container->getParameter('theme')); |
109 | $config->setItemsPerPage($this->container->getParameter('items_on_page')); | 109 | $config->setItemsPerPage($this->container->getParameter('items_on_page')); |
110 | $config->setRssLimit($this->getContainer()->getParameter('rss_limit')); | 110 | $config->setRssLimit($this->container->getParameter('rss_limit')); |
111 | $config->setLanguage($this->container->getParameter('language')); | 111 | $config->setLanguage($this->container->getParameter('language')); |
112 | 112 | ||
113 | $em->persist($config); | 113 | $em->persist($config); |
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index f2f8dd65..14f1dcb2 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
@@ -25,7 +25,7 @@ class RssController extends Controller | |||
25 | ->findUnreadByUser( | 25 | ->findUnreadByUser( |
26 | $user->getId(), | 26 | $user->getId(), |
27 | 0, | 27 | 0, |
28 | $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') | 28 | $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') |
29 | ); | 29 | ); |
30 | 30 | ||
31 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 31 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |
@@ -49,7 +49,7 @@ class RssController extends Controller | |||
49 | ->findArchiveByUser( | 49 | ->findArchiveByUser( |
50 | $user->getId(), | 50 | $user->getId(), |
51 | 0, | 51 | 0, |
52 | $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') | 52 | $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') |
53 | ); | 53 | ); |
54 | 54 | ||
55 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 55 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |
@@ -73,7 +73,7 @@ class RssController extends Controller | |||
73 | ->findStarredByUser( | 73 | ->findStarredByUser( |
74 | $user->getId(), | 74 | $user->getId(), |
75 | 0, | 75 | 0, |
76 | $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') | 76 | $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') |
77 | ); | 77 | ); |
78 | 78 | ||
79 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 79 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |