Merge branch 'hotfix-intparam'

Indicia-Team · Apr 1, 2021 · 4253843 · 4253843
2 parents 44415a4 + 0b79807
commit 4253843
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -29,7 +29,7 @@
  *
  * @var string
  */
-$config['version'] = '5.1.3';
+$config['version'] = '5.1.4';
 
 /**
  * Version release date.

diff --git a/modules/indicia_svc_data/controllers/services/data.php b/modules/indicia_svc_data/controllers/services/data.php
@@ -1304,14 +1304,14 @@ protected function apply_get_parameters_to_db($count = FALSE) {
               }
               $where["$this->viewname.$param"] = $value;
             }
-            if ($this->view_columns[$param]['type'] === 'bool') {
+            elseif ($this->view_columns[$param]['type'] === 'bool') {
               if (!preg_match('/^[tf]$/i', trim($value))) {
                 throw new ValidationError('Validation error', 2003, 'Invalid format for boolean column filter.');
               }
               $where["$this->viewname.$param"] = $value;
             }
             elseif (strpos($value, '*') === FALSE) {
-              $where["$this->viewname.$param"] = pg_escape_string($value);
+              $where["$this->viewname.$param"] = $value;
             }
             else {
               $like["$this->viewname.$param"] = pg_escape_string(str_replace('*', '%', $value));