Merge branch 'dev' of http://dev.quiqqer.com:3000/quiqqer/package-bricks into dev

lib/QUI/Bricks/Controls/Pagination.php

@@ -132,12 +132,22 @@ public function getBody()
         $start = $active - $gap;
         $end   = $active + $gap;
 
+        if ($showmax % 2 === 0) {
+            $end--; // -1, weil aktuelle seite nicht mit berechnet werden soll
+        }
+
         if ($start <= 0) {
             $start = 1;
+            $end   = $showmax;
         }
 
         if ($end >= $count) {
-            $end = $count;
+            $end   = $count;
+            $start = $end - $showmax + 1;
+
+            if ($start <= 0) {
+                $start = 1;
+            }
         }
 
         // get params
@@ -198,6 +208,8 @@ public function loadFromRequest()
         $this->setAttribute('limit', $limit);
         $this->setAttribute('order', $order);
         $this->setAttribute('sheet', $sheet);
+
+        $this->_urlParams = QUI::getRewrite()->getUrlParamsList();
     }
 
     /**