Merge pull request #19225 from colemanw/select2Tweak

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

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 45e0378974903192132872b49f14eaaffaa01525..54ad2e1a74d16c79630fef4e8cf6f55846ed0ea7 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -178,7 +178,7 @@ class CRM_Core_BAO_ConfigSetting {
        * If the language is specified via "lcMessages" we skip this, since the
        * intention of the URL query var is to override all other sources.
        */
-      if ($settings->get('inheritLocale') && empty($chosenLocale)) {
+      if ($settings->get('inheritLocale')) {
 
         /*
          * FIXME: On multi-language installs, CRM_Utils_System::getUFLocale() in