diff --git a/CHANGELOG.md b/CHANGELOG.md index 786fd38..928c855 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +* Ensure postal code is only added to city if `CVRAdresse_postdistrikt` is not set. * Added missing use statement to fix issue on datafordeler settings pages `pnumber_lookup`, `cvr_lookup` and `cpr_lookup`. diff --git a/src/Plugin/os2web/DataLookup/DatafordelerCVR.php b/src/Plugin/os2web/DataLookup/DatafordelerCVR.php index 9d98623..8dfac53 100644 --- a/src/Plugin/os2web/DataLookup/DatafordelerCVR.php +++ b/src/Plugin/os2web/DataLookup/DatafordelerCVR.php @@ -94,10 +94,7 @@ public function lookup(string $param): CompanyLookupResult { $cvrResult->setFloor($address->CVRAdresse_etagebetegnelse ?? ''); $cvrResult->setApartmentNr($address->CVRAdresse_doerbetegnelse ?? ''); $cvrResult->setPostalCode($address->CVRAdresse_postnummer ?? ''); - $city = implode(' ', array_filter([ - $address->CVRAdresse_postdistrikt ?? NULL, - $cvrResult->getPostalCode() ?? NULL, - ])); + $city = $address->CVRAdresse_postdistrikt ?? $cvrResult->getPostalCode(); $cvrResult->setCity($city); $cvrResult->setMunicipalityCode($address->CVRAdresse_kommunekode ?? '');