Merge remote-tracking branch 'origin/develop' into gli-2874
This commit is contained in:
@@ -875,9 +875,13 @@ class AdminControllerCore extends Controller
|
||||
$prefix = $this->getCookieFilterPrefix();
|
||||
$filters = array();
|
||||
if (isset($this->list_id)) {
|
||||
$postPrefixPattern = '#^('.
|
||||
$this->list_id.'Filter_|'.
|
||||
'submitFilter'.
|
||||
')#i';
|
||||
foreach ($_POST as $key => $value) {
|
||||
// only process the filter fields.
|
||||
if (stripos($key, $this->list_id.'Filter_') !== 0) {
|
||||
if (!preg_match($postPrefixPattern, $key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -898,9 +902,15 @@ class AdminControllerCore extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
$getPrefixPattern = '#^(' .
|
||||
'submitFilter|'.
|
||||
$this->list_id.'Filter_|'.
|
||||
$this->list_id.'Orderby|'.
|
||||
$this->list_id.'Orderway'.
|
||||
')#i';
|
||||
foreach ($_GET as $key => $value) {
|
||||
// only process the filter fields.
|
||||
if (stripos($key, $this->list_id.'Filter_') !== 0) {
|
||||
// only process the filter and order by, order way fields.
|
||||
if (!preg_match($getPrefixPattern, $key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user