Merge branch 'develop' into gli-2949

This commit is contained in:
Amit sharma
2026-03-27 16:54:34 +05:30
42 changed files with 522 additions and 232 deletions

View File

@@ -875,7 +875,15 @@ 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 (!preg_match($postPrefixPattern, $key)) {
continue;
}
if (is_array($value)) {
if (isset($value[0], $value[1]) && $value[0] === '' && $value[1] === '') {
@@ -894,7 +902,17 @@ 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 and order by, order way fields.
if (!preg_match($getPrefixPattern, $key)) {
continue;
}
if (is_array($value)) {
if (isset($value[0], $value[1]) && $value[0] === '' && $value[1] === '') {
@@ -2379,7 +2397,7 @@ class AdminControllerCore extends Controller
$must_have_module_list = file_get_contents(_PS_ROOT_DIR_.Module::CACHE_FILE_MUST_HAVE_MODULES_LIST);
if (!empty($must_have_module_list) && $must_have_module_list_xml = @simplexml_load_string($must_have_module_list)) {
$must_have_module_list_array = array();
if (is_object($country_module_list_xml->module)) {
if (is_object($must_have_module_list_xml->module)) {
foreach ($must_have_module_list_xml->module as $l => $mo) {
$all_module_list[] = (string)$mo->name;
}