From f4fc4bab8d77c73ffaebe1827775b1ae130d7c31 Mon Sep 17 00:00:00 2001 From: mankowitz Date: Fri, 5 Sep 2014 15:51:22 -0400 Subject: [PATCH 1/2] Update jqGrid.php --- php/jqGrid.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/jqGrid.php b/php/jqGrid.php index bee42f4..d3e0b7e 100644 --- a/php/jqGrid.php +++ b/php/jqGrid.php @@ -26,7 +26,7 @@ abstract class jqGrid protected $where = array(); protected $where_glue = ' AND '; - protected $where_empty = 'true'; + protected $where_empty = ' true '; protected $table; protected $query; @@ -1781,4 +1781,4 @@ protected function implodePrimaryKey($row) return implode($this->primary_key_glue, $pk_parts); } -} \ No newline at end of file +} From f1eb52d7c3812949ec3154bb2c1dfd81987f56c9 Mon Sep 17 00:00:00 2001 From: mankowitz Date: Fri, 5 Sep 2014 15:58:20 -0400 Subject: [PATCH 2/2] Update jqGrid.php --- php/jqGrid.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/jqGrid.php b/php/jqGrid.php index d3e0b7e..4e7c995 100644 --- a/php/jqGrid.php +++ b/php/jqGrid.php @@ -26,7 +26,7 @@ abstract class jqGrid protected $where = array(); protected $where_glue = ' AND '; - protected $where_empty = ' true '; + protected $where_empty = 'true'; protected $table; protected $query; @@ -736,7 +736,7 @@ protected function buildOrderBy($sidx, $sord) */ protected function buildWhere($where, $glue, $type) { - return $where ? implode($glue, $where) : $this->where_empty; + return ($where ? implode($glue, $where) : $this->where_empty) . "\n"; } /**