Merge pull request #171 from nesl247/master

MarkVaughn · MarkVaughn · commit 30d8619f727b · 2015-02-12T12:47:25.000-05:00
Fixes pagination occurring even if it is disabled in DataTables.
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);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ protected function includeInArray($item, $array)`
`612`	`612`	`*/`
`613`	`613`	`protected function paging()`
`614`	`614`	`{`
`615`		`- if (!is_null($this->input['start']) && !is_null($this->input['length'])) {`
	`615`	`+ if (!is_null($this->input['start']) && !is_null($this->input['length']) && $this->input['length'] != -1) {`
`616`	`616`	`$this->query->skip($this->input['start'])->take((int)$this->input['length'] > 0 ? $this->input['length'] : 10);`
`617`	`617`	`}`
`618`	`618`	`}`