mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge 5c9c5519f3
into 16cb2702af
This commit is contained in:
commit
81e54ffdb3
@ -40,7 +40,18 @@ trait SearchFilterable
|
|||||||
$filterServiceName = "DataListFilter.{$secondArg}";
|
$filterServiceName = "DataListFilter.{$secondArg}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (is_array($value)) {
|
||||||
|
foreach ($value as $key => $val) {
|
||||||
|
if ($val === '' || $val === 'null') {
|
||||||
|
$value[] = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if ($value === '' || $value === 'null') {
|
||||||
|
$value = ['', null];
|
||||||
|
}
|
||||||
|
}
|
||||||
// Build instance
|
// Build instance
|
||||||
return Injector::inst()->create($filterServiceName, $fieldName, $value, $modifiers);
|
return Injector::inst()->create($filterServiceName, $fieldName, $value, $modifiers);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user