* Code for upgrade.
This commit is contained in:
@@ -259,7 +259,7 @@ class commonModel extends model
|
||||
{
|
||||
/* Get configs of system and current user. */
|
||||
$account = isset($this->app->user->account) ? $this->app->user->account : '';
|
||||
if($this->config->db->name and !defined('IN_UPGRADE')) $config = $this->loadModel('setting')->getSysAndPersonalConfig($account);
|
||||
if($this->config->db->name) $config = $this->loadModel('setting')->getSysAndPersonalConfig($account);
|
||||
$this->config->system = isset($config['system']) ? $config['system'] : array();
|
||||
$this->config->personal = isset($config[$account]) ? $config[$account] : array();
|
||||
|
||||
|
||||
@@ -183,7 +183,7 @@ class settingModel extends model
|
||||
$owner = 'system,' . ($account ? $account : '');
|
||||
$records = $this->dao->select('*')->from(TABLE_CONFIG)
|
||||
->where('owner')->in($owner)
|
||||
->andWhere('vision')->in(array('', $this->config->vision))
|
||||
->beginIF(!defined('IN_UPGRADE'))->andWhere('vision')->in(array('', $this->config->vision))->fi()
|
||||
->orderBy('id')
|
||||
->fetchAll('id');
|
||||
if(!$records) return array();
|
||||
|
||||
@@ -319,3 +319,4 @@ $lang->upgrade->fromVersions['max2_4'] = 'Max2.4';
|
||||
$lang->upgrade->fromVersions['max2_5'] = 'Max2.5';
|
||||
$lang->upgrade->fromVersions['max2_6'] = 'Max2.6';
|
||||
$lang->upgrade->fromVersions['max2_7'] = 'Max2.7';
|
||||
$lang->upgrade->fromVersions['max2_8'] = 'Max2.8';
|
||||
|
||||
@@ -53,7 +53,7 @@ class upgradeModel extends model
|
||||
}
|
||||
|
||||
$executeXuanxuan = false;
|
||||
foreach($lang->upgrade->fromVersions as $version => $versionName)
|
||||
foreach($this->lang->upgrade->fromVersions as $version => $versionName)
|
||||
{
|
||||
if(!is_numeric($version[0])) continue;
|
||||
if(version_compare(str_replace('_', '.', $version), str_replace('_', '.', $openVersion)) < 0) continue;
|
||||
|
||||
Reference in New Issue
Block a user