File tree Expand file tree Collapse file tree 1 file changed +12
-5
lines changed Expand file tree Collapse file tree 1 file changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -544,9 +544,6 @@ protected function renderFilterExpression(Filter $filter)
544
544
$ sign = $ filter ->getSign ();
545
545
$ value = $ filter ->getExpression ();
546
546
547
- $ matchWildcard = $ sign === '= ' && ! $ filter instanceof FilterEqual
548
- || $ sign === '!= ' && ! $ filter instanceof FilterNotEqual;
549
-
550
547
if (is_array ($ value )) {
551
548
$ comp = [];
552
549
$ pattern = [];
@@ -582,13 +579,23 @@ protected function renderFilterExpression(Filter $filter)
582
579
}
583
580
584
581
return count ($ sql ) === 1 ? $ sql [0 ] : '( ' . implode (" $ operator " , $ sql ) . ') ' ;
585
- } elseif ($ matchWildcard && $ value !== null && strpos ($ value , '* ' ) !== false ) {
582
+ } elseif (
583
+ $ sign === '= '
584
+ && ! $ filter instanceof FilterEqual
585
+ && $ value !== null
586
+ && strpos ($ value , '* ' ) !== false
587
+ ) {
586
588
if ($ value === '* ' ) {
587
589
return $ column . ' IS NOT NULL ' ;
588
590
}
589
591
590
592
return $ column . ' LIKE ' . $ this ->dbAdapter ->quote (preg_replace ('~\*~ ' , '% ' , $ value ));
591
- } elseif ($ matchWildcard && $ value !== null && strpos ($ value , '* ' ) !== false ) {
593
+ } elseif (
594
+ $ sign === '!= '
595
+ && ! $ filter instanceof FilterNotEqual
596
+ && $ value !== null
597
+ && strpos ($ value , '* ' ) !== false
598
+ ) {
592
599
if ($ value === '* ' ) {
593
600
return $ column . ' IS NULL ' ;
594
601
}
You can’t perform that action at this time.
0 commit comments