Merge pull request #10736 from eileenmcnaughton/reg

CRM-20950 Prt 2 Contact import mapping to wrong location type
civicrm · Jul 24, 2017 · 7e38353 · 7e38353
2 parents 5b59f81 + 28557f5
commit 7e38353
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Contact/Import/ImportJob.php b/CRM/Contact/Import/ImportJob.php
@@ -143,7 +143,7 @@ public function runImport(&$form, $timeout = 55) {
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
     $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
     $websiteTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Website', 'website_type_id');
-    $locationTypes = array_merge(array('Primary' => ts('Primary')), CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id'));
+    $locationTypes = array('Primary' => ts('Primary')) + CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
 
     foreach ($mapper as $key => $value) {