Merge pull request #171 from nesl247/master

Fixes pagination occurring even if it is disabled in DataTables.
bgultekin · Feb 12, 2015 · 30d8619 · 30d8619
2 parents 2f31def + 9b89c60
commit 30d8619
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Bllim/Datatables/Datatables.php b/src/Bllim/Datatables/Datatables.php
@@ -612,7 +612,7 @@ protected function includeInArray($item, $array)
      */
     protected function paging()
     {
-        if (!is_null($this->input['start']) && !is_null($this->input['length'])) {
+        if (!is_null($this->input['start']) && !is_null($this->input['length']) && $this->input['length'] != -1) {
             $this->query->skip($this->input['start'])->take((int)$this->input['length'] > 0 ? $this->input['length'] : 10);
         }
     }