Merge pull request #23282 from eileenmcnaughton/import_default_locati…

…on_type [REF] Do not treat site having a default location type as optional
civicrm · May 5, 2022 · 1e31701 · 1e31701
2 parents a863d40 + 45a5074
commit 1e31701
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
@@ -138,12 +138,8 @@ public function buildQuickForm() {
 
     $this->_location_types = ['Primary' => ts('Primary')] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
     $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
-
-    // Pass default location to js
-    if ($defaultLocationType) {
-      $this->assign('defaultLocationType', $defaultLocationType->id);
-      $this->assign('defaultLocationTypeLabel', $this->_location_types[$defaultLocationType->id]);
-    }
+    $this->assign('defaultLocationType', $defaultLocationType->id);
+    $this->assign('defaultLocationTypeLabel', $this->_location_types[$defaultLocationType->id]);
 
     /* Initialize all field usages to false */
     foreach ($mapperKeys as $key) {