Merge pull request #17719 from civicrm/5.27

[civicrm-core.git] / CRM / Core / BAO / Country.php

diff --git a/CRM/Core/BAO/Country.php b/CRM/Core/BAO/Country.php
index 10934d932c11c74c22eceda9bbde41268ffc78bb..49413ba891d41640a39a644efa0aad4ef9ba5d08 100644 (file)
--- a/CRM/Core/BAO/Country.php
+++ b/CRM/Core/BAO/Country.php
@@ -57,7 +57,7 @@ class CRM_Core_BAO_Country extends CRM_Core_DAO_Country {
     if (!isset(Civi::$statics[__CLASS__]['countryLimit'])) {
       $countryIsoCodes = CRM_Core_PseudoConstant::countryIsoCode();
       $country = [];
-      $countryLimit = Civi::settings()->get('countryLimit');
+      $countryLimit = Civi::settings()->get('countryLimit') ?? [];
       if (is_array($countryLimit)) {
         foreach ($countryLimit as $val) {
           // CRM-12007