Merge branch 'ticket-9374-SaveEuroSign'
This commit is contained in:
commit
f367ef99a5
@ -1463,13 +1463,19 @@ class AdminImport extends AdminTab
|
||||
$value = str_replace("\x92", "'", $value);
|
||||
$value = str_replace("’", "'", $value);
|
||||
$value = str_replace("\x9C", "oe", $value);
|
||||
$value = str_replace("\x80", "€", $value);
|
||||
$value = str_replace("\x26", "&", $value);
|
||||
$array[$key] = utf8_encode($value);
|
||||
$array[$key] = str_replace("â¬", "€", $array[$key]);
|
||||
}
|
||||
else{
|
||||
$array = str_replace("\x92", "'", $array);
|
||||
$array = str_replace("’", "'", $array);
|
||||
$value = str_replace("\x9C", "oe", $value);
|
||||
$array = str_replace("\x9C", "oe", $array);
|
||||
$array = str_replace("\x80", "€", $array);
|
||||
$array = str_replace("\x26", "&", $array);
|
||||
$array = utf8_encode($array);
|
||||
$array = str_replace("â¬", "€", $array);
|
||||
}
|
||||
|
||||
return $array;
|
||||
|
Loading…
Reference in New Issue
Block a user