Merge pull request #13465 from mlutfy/setLocale

setLocale: precaution for when setLocale is called on an unilingual site
civicrm · Jan 15, 2019 · b105d55 · b105d55
2 parents 1130d03 + 6b08414
commit b105d55
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
@@ -667,9 +667,12 @@ public function setLocale($locale) {
       $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;