diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-21 14:51:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-21 14:51:46 +0200 |
commit | 8c68acff2abe0573e287ad9ee4589668d1bb7ffa (patch) | |
tree | 0e67b949bde3bf8c441bfa77cbf9aa0a49326f72 /src/Wallabag/CoreBundle/Helper | |
parent | 80784b782becfaa297e6d9cbb0584e27739cffc8 (diff) | |
parent | bd40f1af88979cb5257206d178d26819e350a24c (diff) | |
download | wallabag-8c68acff2abe0573e287ad9ee4589668d1bb7ffa.tar.gz wallabag-8c68acff2abe0573e287ad9ee4589668d1bb7ffa.tar.zst wallabag-8c68acff2abe0573e287ad9ee4589668d1bb7ffa.zip |
Merge pull request #3207 from wallabag/tag-rss
Add RSS for tags
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index df579ebd..231a0b52 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |||
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Helper; | |||
4 | 4 | ||
5 | use Pagerfanta\Adapter\AdapterInterface; | 5 | use Pagerfanta\Adapter\AdapterInterface; |
6 | use Pagerfanta\Pagerfanta; | 6 | use Pagerfanta\Pagerfanta; |
7 | use Wallabag\UserBundle\Entity\User; | ||
7 | use Symfony\Component\Routing\Router; | 8 | use Symfony\Component\Routing\Router; |
8 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; | 9 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
9 | 10 | ||
@@ -20,12 +21,15 @@ class PreparePagerForEntries | |||
20 | 21 | ||
21 | /** | 22 | /** |
22 | * @param AdapterInterface $adapter | 23 | * @param AdapterInterface $adapter |
24 | * @param User $user If user isn't logged in, we can force it (like for rss) | ||
23 | * | 25 | * |
24 | * @return null|Pagerfanta | 26 | * @return null|Pagerfanta |
25 | */ | 27 | */ |
26 | public function prepare(AdapterInterface $adapter) | 28 | public function prepare(AdapterInterface $adapter, User $user = null) |
27 | { | 29 | { |
28 | $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; | 30 | if (null === $user) { |
31 | $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; | ||
32 | } | ||
29 | 33 | ||
30 | if (null === $user || !is_object($user)) { | 34 | if (null === $user || !is_object($user)) { |
31 | return; | 35 | return; |