improve omitFirstPage

instead of setting the page parameter to null don't set it at all if omitFirstPage is set to true and page is first page. Otherwise some routers may append a questionmark at the end of the url even if there are no other parameters
sampart · Jan 10, 2017 · dfe64b7 · dfe64b7
1 parent 63a0a38
commit dfe64b7
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Twig/PagerfantaExtension.php b/Twig/PagerfantaExtension.php
@@ -138,9 +138,8 @@ private function createRouteGenerator($options = array())
 
         return function($page) use($router, $routeName, $routeParams, $pagePropertyPath, $omitFirstPage) {
             $propertyAccessor = PropertyAccess::createPropertyAccessor();
-            if($omitFirstPage){
-                $propertyAccessor->setValue($routeParams, $pagePropertyPath, $page > 1 ? $page : null);
-            } else {
+            // don't set the page parameter if it is the first page and the omitFirstPage flag is true
+            if(!$omitFirstPage || $page > 1 ){
                 $propertyAccessor->setValue($routeParams, $pagePropertyPath, $page);
             }