fix NULL comparison, #40

ikkez · Feb 28, 2017 · e303fdc · e303fdc
1 parent 0582270
commit e303fdc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/db/cortex.php b/lib/db/cortex.php
@@ -2189,8 +2189,9 @@ public function prepareFilter($cond, $engine, $db, $fieldConf=null) {
 							$bindMarks = str_repeat('?,', count($val) - 1).'?';
 							$part = substr($part, 0, $pos).'IN ('.$bindMarks.')';
 							$ncond = array_merge($ncond, $val);
-						} elseif($val === null && preg_match('/(\w+)\s*([!=<>]+)\s*\?/i',$part,$match)) {
-							$part = $match[1].' IS '.($match[2]=='='||$match[2]=='=='?'':'NOT ').'NULL';
+						} elseif($val === null &&
+							preg_match('/(\S[\w\-]+\S)\s*(!?==?)\s*(?:\?|:\w+)/i',$part,$match)) {
+							$part = $match[1].' IS '.($match[2][0]=='!'?'NOT ':'').'NULL';
 						} else
 							$ncond[] = $val;
 					}