Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change for 6.4 version.

Browse Source
This commit is contained in:
wangyidong
2014-12-16 08:15:30 +00:00
parent d7c0a03f8b
commit 644fc7df6a
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
6.3.stable
6.4.stable
config/config.php
+1 -1
View File
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '6.3'; // The version of zentaopms. Don't change it.
$config->version = '6.4'; // The version of zentaopms. Don't change it.
$config->charset = 'UTF-8'; // The charset of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
module/upgrade/js/execute.js
+5 -3
View File
@@ -2,10 +2,12 @@ $(function()
{
if(result == 'success')
{
$.get(createLink('upgrade', 'ajaxCheckExtension'), function(data)
$.ajax(
{
$('#checkExtension').html(data);
$('#tohome').html(tohome);
type: "get",
url: createLink('upgrade', 'ajaxCheckExtension'),
success: function(data){$('#checkExtension').html(data);},
complete: function(){$('#tohome').html(tohome);}
});
}
});
module/upgrade/lang/en.php
+1
View File
@@ -85,3 +85,4 @@ $lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
$lang->upgrade->fromVersions['6_0'] = '6.0';
$lang->upgrade->fromVersions['6_1'] = '6.1';
$lang->upgrade->fromVersions['6_2'] = '6.2';
$lang->upgrade->fromVersions['6_3'] = '6.3';
module/upgrade/lang/zh-cn.php
+1
View File
@@ -85,3 +85,4 @@ $lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
$lang->upgrade->fromVersions['6_0'] = '6.0';
$lang->upgrade->fromVersions['6_1'] = '6.1';
$lang->upgrade->fromVersions['6_2'] = '6.2';
$lang->upgrade->fromVersions['6_3'] = '6.3';
module/upgrade/model.php
+2
View File
@@ -113,6 +113,7 @@ class upgradeModel extends model
case '6_1':
$this->execSQL($this->getUpgradeFile('6.1'));
case '6_2':
case '6_3':
default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
}
@@ -176,6 +177,7 @@ class upgradeModel extends model
case '6_0': $confirmContent .= file_get_contents($this->getUpgradeFile('6.0'));
case '6_1': $confirmContent .= file_get_contents($this->getUpgradeFile('6.1'));
case '6_2':
case '6_3':
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}