GX-Bug #51521 » MediafinanzHouseNumberFix1.patch
| src/admin/includes/modules/mediafinanz/models/MF/Suspect.php (revision ) | ||
|---|---|---|
| 136 | 136 |
customers_telephone as phone, |
| 137 | 137 |
entry_firstname, |
| 138 | 138 |
entry_lastname, |
| 139 |
entry_street_address, |
|
| 139 |
CONCAT(entry_street_address,\' \',entry_house_number) as entry_street_address,
|
|
| 140 | 140 |
entry_postcode, |
| 141 | 141 |
entry_city, |
| 142 | 142 |
countries_iso_code_2 as country, |
| ... | ... | |
| 200 | 200 |
customers_telephone AS phone, |
| 201 | 201 |
billing_firstname AS firstname, |
| 202 | 202 |
billing_lastname AS lastname, |
| 203 |
billing_street_address AS street,
|
|
| 203 |
CONCAT(billing_street_address,\' \',billing_house_number) AS street,
|
|
| 204 | 204 |
billing_postcode AS postcode, |
| 205 | 205 |
billing_city AS city, |
| 206 | 206 |
billing_country_iso_code_2 as country, |
| src/admin/includes/modules/mediafinanz/models/MF/Address.php (revision ) | ||
|---|---|---|
| 113 | 113 |
/* We also allow hexadecimal characters, because some servers do not have the right locale settings. |
| 114 | 114 |
C4 = Ä, E4 = ä, D6 = Ö, F6 = ö, DC = Ü, FC = ü, DF = ß |
| 115 | 115 |
*/ |
| 116 |
if (!preg_match('/^([\w\xDF\xC4\xE4\xD6\xF6\xDC\xFC\-\. ]+?)[,]?[\/]?[ ]?(\d+ ?[a-zA-Z]?(?: ?[-\/] ?\d+ ?[a-zA-Z]?)*)$/', $street, $matches))
|
|
| 116 |
if (!preg_match('/^([\w\xDF\xC4\xE4\xD6\xF6\xDC\xFC\-\. ]+?)[,]?[\/]?[ ]?(\d+ ?[a-zA-Z]?(?: ?[-\/] ?\d+ ?[a-zA-Z]?)*)$/u', $street, $matches))
|
|
| 117 | 117 |
{
|
| 118 | 118 |
return array('street' => $street,
|
| 119 | 119 |
'houseNumber' => ''); |
| src/admin/includes/modules/mediafinanz/display.php (revision ) | ||
|---|---|---|
| 46 | 46 |
customers_telephone AS phone, |
| 47 | 47 |
customers_firstname AS firstname, |
| 48 | 48 |
customers_lastname AS lastname, |
| 49 |
customers_street_address AS street,
|
|
| 49 |
CONCAT(customers_street_address,\' \',customers_house_number) AS street,
|
|
| 50 | 50 |
customers_postcode AS postcode, |
| 51 | 51 |
customers_city AS city, |
| 52 | 52 |
countries_iso_code_2 as country, |