Merge pull request #19044 from seamuslee001/dev_drupal_149

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

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index ce8175324c3644b27a49da45ffffc5cc102222b9..0c560c872324b4e034831b905682d18b4321b56b 100644 (file)
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -586,12 +586,22 @@ class CRM_Core_I18n {
   /**
    * Is the current CiviCRM domain in multilingual mode.
    *
-   * @return Bool
+   * @return bool
    *   True if CiviCRM is in multilingual mode.
    */
   public static function isMultilingual() {
-    $domainId = CRM_Core_Config::domainID();
-    return (bool) CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Domain', $domainId, 'locales');
+    $domain = CRM_Core_BAO_Domain::getDomain();
+    return (bool) $domain->locales;
+  }
+
+  /**
+   * Returns languages if domain is in multilingual mode.
+   *
+   * @return array|bool
+   */
+  public static function getMultilingual() {
+    $domain = CRM_Core_BAO_Domain::getDomain();
+    return $domain->locales ? CRM_Core_DAO::unSerializeField($domain->locales, CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED) : FALSE;
   }
 
   /**
@@ -600,7 +610,7 @@ class CRM_Core_I18n {
    * @param $language
    *   Language (for example 'en_US', or 'fr_CA').
    *
-   * @return Bool
+   * @return bool
    *   True if it is an RTL language.
    */
   public static function isLanguageRTL($language) {