Merge pull request #23609 from briennekordis/leading_zero_fix

[civicrm-core.git] / CRM / Admin / Page / LocationType.php

diff --git a/CRM/Admin/Page/LocationType.php b/CRM/Admin/Page/LocationType.php
index 45de123bcf2ef0732076afd7fd79d65988938a88..0b8b9022763e269e1ef4670a166423f5fb010016 100644 (file)
--- a/CRM/Admin/Page/LocationType.php
+++ b/CRM/Admin/Page/LocationType.php
@@ -107,4 +107,24 @@ class CRM_Admin_Page_LocationType extends CRM_Core_Page_Basic {
     return 'civicrm/admin/locationType';
   }
 
+  /**
+   * @param $sort
+   * @param $action
+   * @param array $links
+   *
+   * @return array
+   */
+  protected function getRows($sort, $action, array $links): array {
+    $rows = parent::getRows($sort, $action, $links);
+    foreach ($rows as &$row) {
+      // prevent smarty notices.
+      foreach (['is_default', 'class', 'vcard_name'] as $expectedField) {
+        if (!isset($row['is_default'])) {
+          $row[$expectedField] = NULL;
+        }
+      }
+    }
+    return $rows;
+  }
+
 }