projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite jquery.dashboard.js as Angular app
[civicrm-core.git]
/
CRM
/
Upgrade
/
Form.php
diff --git
a/CRM/Upgrade/Form.php
b/CRM/Upgrade/Form.php
index f08257affb0deae2cd8b58236ef14ece19ad02c2..2ab3c1c7e8d87d909d729d1638c3e331336e53e9 100644
(file)
--- 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();
) {
$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;
$smarty = CRM_Core_Smarty::singleton();
//$smarty->compile_dir = $this->_config->templateCompileDir;
@@
-287,19
+286,6
@@
SET version = '$version'
return FALSE;
}
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
/**
* @return array
* @throws Exception