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

Merge branch 'master' into 'liyuchun_fixbug_22074'

Browse Source 
# Conflicts:
#   lib/filter/filter.class.php
This commit is contained in:
孙广明
2022-04-28 10:34:02 +00:00
parent 5a6ea32f8e 6f60b5627a
commit 700b2d6bb1
67 changed files with 525 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/install/control.php
+3 -3
View File
@@ -218,13 +218,13 @@ class install extends control
if(!empty($_POST))
{
$this->install->grantPriv();
if(dao::isError()) return print(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()) . js::locate('back'));
$this->install->updateLang();
if(dao::isError()) return print(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()) . js::locate('back'));
if($this->post->importDemoData) $this->install->importDemoData();
if(dao::isError()) echo js::alert($this->lang->install->errorImportDemoData);
if(dao::isError()) return print(js::alert($this->lang->install->errorImportDemoData) . js::locate('back'));
$this->loadModel('setting');
$this->setting->updateVersion($this->config->version);