ft filter fix

This commit is contained in:
Yuri Kuznetsov
2022-04-14 13:26:15 +03:00
parent dc5c572a9f
commit 1a70fdfd41
@@ -142,7 +142,7 @@ class DefaultDataComposer implements DataComposer
$filter = str_replace('"*', '"', $filter);
$filter = str_replace('*"', '"', $filter);
while (strpos($filter, '**')) {
while (strpos($filter, '**') !== false) {
$filter = trim(
str_replace('**', '*', $filter)
);
@@ -154,7 +154,7 @@ class DefaultDataComposer implements DataComposer
);
}
$filter = str_replace(['+-', '--', '-+', '++'], '', $filter);
$filter = str_replace(['+-', '--', '-+', '++', '+*', '-*'], '', $filter);
while (strpos($filter, '+ ') !== false) {
$filter = str_replace('+ ', '', $filter);
@@ -168,6 +168,10 @@ class DefaultDataComposer implements DataComposer
$filter = substr($filter, 0, -1);
}
if ($filter === '*') {
$filter = '';
}
return $filter;
}