* change for upgrade.

This commit is contained in:
wangyidong
2016-05-24 15:07:28 +08:00
parent 74f4d67357
commit ce5106ae5a
8 changed files with 9 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
8.2.stable
8.2.1
+1 -1
View File
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '8.2'; // The version of zentaopms. Don't change it.
$config->version = '8.2.1'; // 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
+1
View File
@@ -385,6 +385,7 @@ $lang->error->accessDenied = '您沒有訪問權限';
$lang->error->pasteImg = '您的瀏覽器不支持粘貼圖片!';
$lang->error->noData = '沒有數據';
$lang->error->editedByOther = '該記錄可能已經被改動。請刷新頁面重新編輯!';
$lang->error->tutorialData = '新手模式下不會插入數據,請退出新手模式操作';
/* 分頁信息。*/
$lang->pager = new stdclass();
+1
View File
@@ -101,3 +101,4 @@ $lang->upgrade->fromVersions['8_0_1'] = '8.0.1';
$lang->upgrade->fromVersions['8_1'] = '8.1';
$lang->upgrade->fromVersions['8_1_3'] = '8.1.3';
$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta';
$lang->upgrade->fromVersions['8_2'] = '8.2';
+1
View File
@@ -101,3 +101,4 @@ $lang->upgrade->fromVersions['8_0_1'] = '8.0.1';
$lang->upgrade->fromVersions['8_1'] = '8.1';
$lang->upgrade->fromVersions['8_1_3'] = '8.1.3';
$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta';
$lang->upgrade->fromVersions['8_2'] = '8.2';
+1
View File
@@ -101,3 +101,4 @@ $lang->upgrade->fromVersions['8_0_1'] = '8.0.1';
$lang->upgrade->fromVersions['8_1'] = '8.1';
$lang->upgrade->fromVersions['8_1_3'] = '8.1.3';
$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta';
$lang->upgrade->fromVersions['8_2'] = '8.2';
+2
View File
@@ -141,6 +141,7 @@ class upgradeModel extends model
$this->addPriv8_2_beta();
$this->adjustConfigSectionAndKey();
case '8_2_beta':
case '8_2':
default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
}
@@ -218,6 +219,7 @@ class upgradeModel extends model
case '8_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.1'));
case '8_1_3': $confirmContent .= file_get_contents($this->getUpgradeFile('8.1.3'));
case '8_2_beta':
case '8_2':
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
+1
View File
@@ -68,6 +68,7 @@ $whiteList[] = 'sso-getuserpairs';
$whiteList[] = 'sso-getbindusers';
$whiteList[] = 'sso-binduser';
$whiteList[] = 'sso-createuser';
$whiteList[] = 'sso-gettodolist';
$whiteList[] = 'mail-asyncsend';
$whiteList[] = 'user-reset';
$whiteList[] = 'product-showerrornone';