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

Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8

Browse Source
This commit is contained in:
wangyidong
2018-03-27 14:23:40 +08:00
parent 4d8984eeb5 7f520b741d
commit bafde6b274
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/dao/dao.class.php
+2
View File
@@ -1654,6 +1654,8 @@ class baseSQL
*/
public function set($set)
{
if($this->inCondition and !$this->conditionIsTrue) return $this;
/* Add ` to avoid keywords of mysql. */
if(strpos($set, '=') ===false)
{
module/misc/lang/en.php
+1 -1
View File
@@ -74,7 +74,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Latest Version';
$lang->misc->feature->detailed = 'Details';
$lang->misc->releaseDate['9.8.stable'] = '2017-01-17';
$lang->misc->releaseDate['9.8.stable'] = '2018-01-17';
$lang->misc->releaseDate['9.7.stable'] = '2017-12-22';
$lang->misc->releaseDate['9.6.stable'] = '2017-11-06';
$lang->misc->releaseDate['9.5.1'] = '2017-09-27';
module/misc/lang/zh-cn.php
+1 -1
View File
@@ -74,7 +74,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '详情';
$lang->misc->releaseDate['9.8.stable'] = '2017-01-17';
$lang->misc->releaseDate['9.8.stable'] = '2018-01-17';
$lang->misc->releaseDate['9.7.stable'] = '2017-12-22';
$lang->misc->releaseDate['9.6.stable'] = '2017-11-06';
$lang->misc->releaseDate['9.5.1'] = '2017-09-27';