Merge pull request #15361 from seamuslee001/index_geo_code_fields

[civicrm-core.git] / CRM / Core / I18n.php

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index a128119ed42791b0585edf7ce20522cf2b1c04ac..f6ef3f4de173f3b85387121838c4fdbe2ebf67ae 100644 (file)
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -230,11 +230,11 @@ class CRM_Core_I18n {
     }
 
     if ($enabled === NULL) {
-      $config = CRM_Core_Config::singleton();
+      $languageLimit = Civi::settings()->get('languageLimit');
       $enabled = [];
-      if (isset($config->languageLimit) and $config->languageLimit) {
+      if ($languageLimit) {
         foreach ($all as $code => $name) {
-          if (in_array($code, array_keys($config->languageLimit))) {
+          if (array_key_exists($code, $languageLimit)) {
             $enabled[$code] = $name;
           }
         }