X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUpgrade%2FForm.php;h=2ab3c1c7e8d87d909d729d1638c3e331336e53e9;hb=f263929f90c38c9c4b1e1c02c0b7c4ed56ea68d8;hp=f08257affb0deae2cd8b58236ef14ece19ad02c2;hpb=93c4c2a90f9d22ec94aa8fbc6ac389604da34151;p=civicrm-core.git diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index f08257affb..2ab3c1c7e8 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -68,11 +68,10 @@ class CRM_Upgrade_Form extends CRM_Core_Form { ) { $this->_config = CRM_Core_Config::singleton(); - $domain = new CRM_Core_DAO_Domain(); - $domain->find(TRUE); + $locales = CRM_Core_I18n::getMultilingual(); - $this->multilingual = (bool) $domain->locales; - $this->locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); + $this->multilingual = (bool) $locales; + $this->locales = $locales; $smarty = CRM_Core_Smarty::singleton(); //$smarty->compile_dir = $this->_config->templateCompileDir; @@ -287,19 +286,6 @@ SET version = '$version' return FALSE; } - /** - * @param $version - * - * @return bool - */ - public function checkVersion($version) { - $domainID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Domain', - $version, 'id', - 'version' - ); - return (bool) $domainID; - } - /** * @return array * @throws Exception