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

Merge branch release/21.7.6 of zentao/zentaopms (#11905)

Browse Source
This commit is contained in:
刘刚
2025-10-17 09:07:30 +08:00
committed by Gitfox
parent 9c0c44e18d c4536d94e2
commit 1099d3e02f
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/install/model.php
+2 -2
View File
@@ -24,8 +24,8 @@ class installModel extends model
{
$clientLang = $this->app->getClientLang();
$licenseCN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.CN');
$licenseEN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.EN');
$licenseCN = file_get_contents($this->app->getBasePath() . 'LICENSE.CN');
$licenseEN = file_get_contents($this->app->getBasePath() . 'LICENSE.EN');
if($clientLang == 'zh-cn' || $clientLang == 'zh-tw') return $licenseCN . $licenseEN;
return $licenseEN . $licenseCN;
module/upgrade/control.php
+1 -8
View File
@@ -48,15 +48,8 @@ class upgrade extends control
{
if($this->get->agree == true) $this->locate(inlink('backup'));
$clientLang = $this->app->getClientLang();
$licenseCN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.CN');
$licenseEN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.EN');
$license = $licenseEN . $licenseCN;
if($clientLang == 'zh-cn' || $clientLang == 'zh-tw') $license = $licenseCN . $licenseEN;
$this->view->title = $this->lang->upgrade->common;
$this->view->license = $license;
$this->view->license = $this->loadModel('install')->getLicense();
$this->display();
}