use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Exception\OutOfRangeCurrentPageException;
-use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
}
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery());
- $entries = new Pagerfanta($pagerAdapter);
- $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
+ $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
+ ->prepare($pagerAdapter, $page);
+
try {
$entries->setCurrentPage($page);
} catch (OutOfRangeCurrentPageException $e) {
}
/**
- * Changes favorite status for an entry.
+ * Changes starred status for an entry.
*
* @param Request $request
* @param Entry $entry
$url = $this->generateUrl(
'view',
['id' => $entry->getId()],
- UrlGeneratorInterface::ABSOLUTE_URL
+ UrlGeneratorInterface::ABSOLUTE_PATH
);
$em = $this->getDoctrine()->getManager();
'flashes.entry.notice.entry_deleted'
);
- // don't redirect user to the deleted entry
- $to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null);
+ // don't redirect user to the deleted entry (check that the referer doesn't end with the same url)
+ $referer = $request->headers->get('referer');
+ $to = (1 !== preg_match('#'.$url.'$#i', $referer) ? $referer : null);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);