From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Tue, 15 Jan 2019 19:14:53 +0000 (-0500)
Subject: setLocale: precaution for when setLocale is called on an unilingual site
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6b084142dcb00fe8e2a0d88ab6d63e5ccaa2ccb5;p=civicrm-core.git

setLocale: precaution for when setLocale is called on an unilingual site
---

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index 02340b421c..119ff57f9d 100644
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -667,9 +667,12 @@ class CRM_Core_I18n {
       $this->setPhpGettextLocale($locale);
     }
 
-    // for sql queries
+    // For sql queries, if running in DB multi-lingual mode.
     global $dbLocale;
-    $dbLocale = "_{$locale}";
+
+    if ($dbLocale) {
+      $dbLocale = "_{$locale}";
+    }
 
     // For self::getLocale()
     global $tsLocale;