Merge branch 'develop' into gli-2941

This commit is contained in:
Amit sharma
2026-05-25 14:42:51 +05:30
166 changed files with 7993 additions and 1198 deletions

View File

@@ -2835,7 +2835,8 @@ class AdminImportControllerCore extends AdminController
AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $customer);
if ($customer->passwd) {
$customer->passwd = Tools::encrypt($customer->passwd);
$objHash = new PasswordHashing();
$customer->passwd = $objHash->passwordHash($customer->passwd);
}
$customers_shop = array();
@@ -3223,7 +3224,25 @@ class AdminImportControllerCore extends AdminController
public function utf8EncodeArray($array)
{
return (is_array($array) ? array_map('utf8_encode', $array) : mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1'));
if (is_array($array)) {
return array_map(function ($value) {
if (is_array($value)) {
return $this->utf8EncodeArray($value);
}
if (!is_string($value)) {
return $value;
}
return mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1');
}, $array);
}
if (!is_string($array)) {
return $array;
}
return mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1');
}
protected function getNbrColumn($handle, $glue)