X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FHelper%2FPreparePagerForEntries.php;h=183d394a08a3a19bdded9b59ea3b10762d060012;hb=3afc87426dade0eaeccf69d144a119c6f0c4534f;hp=7d3798b95523b96e13c789df9abb0de18a101a78;hpb=2fe2e411a74d541ddd7eee2aca1b80ac58de49eb;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index 7d3798b9..183d394a 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php @@ -6,6 +6,7 @@ use Pagerfanta\Adapter\AdapterInterface; use Pagerfanta\Pagerfanta; use Symfony\Component\Routing\Router; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; +use Wallabag\UserBundle\Entity\User; class PreparePagerForEntries { @@ -20,16 +21,18 @@ class PreparePagerForEntries /** * @param AdapterInterface $adapter - * @param int $page + * @param User $user If user isn't logged in, we can force it (like for rss) * - * @return null|Pagerfanta + * @return Pagerfanta|null */ - public function prepare(AdapterInterface $adapter, $page = 1) + public function prepare(AdapterInterface $adapter, User $user = null) { - $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; + if (null === $user) { + $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; + } - if (null === $user || !is_object($user)) { - return null; + if (null === $user || !\is_object($user)) { + return; } $entries = new Pagerfanta($adapter);