forked from wallabag/wallabag
Page parameter was never used in the function
It could have been used if we set the current page inside PreparePagerForEntries. But we did that in each controller because we can have an OutOfRangeCurrentPageException
This commit is contained in:
@ -321,8 +321,7 @@ class EntryController extends Controller
|
|||||||
|
|
||||||
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
|
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
|
||||||
|
|
||||||
$entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
|
$entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
|
||||||
->prepare($pagerAdapter, $page);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$entries->setCurrentPage($page);
|
$entries->setCurrentPage($page);
|
||||||
|
|||||||
@ -125,8 +125,7 @@ class TagController extends Controller
|
|||||||
|
|
||||||
$pagerAdapter = new ArrayAdapter($entriesByTag);
|
$pagerAdapter = new ArrayAdapter($entriesByTag);
|
||||||
|
|
||||||
$entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
|
$entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
|
||||||
->prepare($pagerAdapter, $page);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$entries->setCurrentPage($page);
|
$entries->setCurrentPage($page);
|
||||||
|
|||||||
@ -20,16 +20,15 @@ class PreparePagerForEntries
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param AdapterInterface $adapter
|
* @param AdapterInterface $adapter
|
||||||
* @param int $page
|
|
||||||
*
|
*
|
||||||
* @return null|Pagerfanta
|
* @return null|Pagerfanta
|
||||||
*/
|
*/
|
||||||
public function prepare(AdapterInterface $adapter, $page = 1)
|
public function prepare(AdapterInterface $adapter)
|
||||||
{
|
{
|
||||||
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
|
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
|
||||||
|
|
||||||
if (null === $user || !is_object($user)) {
|
if (null === $user || !is_object($user)) {
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$entries = new Pagerfanta($adapter);
|
$entries = new Pagerfanta($adapter);
|
||||||
|
|||||||
Reference in New Issue
Block a user