Merge pull request #123 from petrtr/patch-1

Kamil Tunkiewicz · Kamil Tunkiewicz · commit 485c1e0c073e · 2014-07-25T10:06:47.000+02:00
Update Datatables.php
diff --git a/src/Bllim/Datatables/Datatables.php b/src/Bllim/Datatables/Datatables.php
@@ -60,8 +60,8 @@ public function __construct() {
             // version < 1.10
             
             $this->input['draw'] = Input::get('sEcho','');
-            $this->input['start'] = Input::get('iDisplayStart','');
-            $this->input['length'] = Input::get('iDisplayLength','');
+            $this->input['start'] = Input::get('iDisplayStart');
+            $this->input['length'] = Input::get('iDisplayLength');
             $this->input['search'] = array(
                 'value' => Input::get('sSearch',''),
                 'regex' => Input::get('bRegex',''),
@@ -432,7 +432,7 @@ protected function include_in_array($item,$array)
      */
     protected function paging()
     {
-        if(!is_null($this->input['start']) && $this->input['start'] != -1)
+        if(!is_null($this->input['start']) && !is_null($this->input['length']))
         {
             $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
`@@ -60,8 +60,8 @@ public function __construct() {`
`60`	`60`	`// version < 1.10`
`61`	`61`
`62`	`62`	`$this->input['draw'] = Input::get('sEcho','');`
`63`		`- $this->input['start'] = Input::get('iDisplayStart','');`
`64`		`- $this->input['length'] = Input::get('iDisplayLength','');`
	`63`	`+ $this->input['start'] = Input::get('iDisplayStart');`
	`64`	`+ $this->input['length'] = Input::get('iDisplayLength');`
`65`	`65`	`$this->input['search'] = array(`
`66`	`66`	`'value' => Input::get('sSearch',''),`
`67`	`67`	`'regex' => Input::get('bRegex',''),`
`@@ -432,7 +432,7 @@ protected function include_in_array($item,$array)`
`432`	`432`	`*/`
`433`	`433`	`protected function paging()`
`434`	`434`	`{`
`435`		`- if(!is_null($this->input['start']) && $this->input['start'] != -1)`
	`435`	`+ if(!is_null($this->input['start']) && !is_null($this->input['length']))`
`436`	`436`	`{`
`437`	`437`	`$this->query->skip($this->input['start'])->take((int)$this->input['length']>0?$this->input['length']:10);`
`438`	`438`	`}`