Merge branch dev/bug-63567 of zentao/zentaopms (#9882)
This commit is contained in:
@@ -426,6 +426,11 @@ class install extends control
|
||||
$this->lang->install->successNoticeLabel = str_replace('IPD', '', $this->lang->install->successNoticeLabel);
|
||||
$this->config->version = $editionName . str_replace(array('max', 'biz', 'ipd'), '', $this->config->version);
|
||||
}
|
||||
elseif(strpos($this->config->version, 'ipd') === false)
|
||||
{
|
||||
$editionName = $this->config->edition === 'open' ? $this->lang->pmsName : $this->lang->{$this->config->edition . 'Name'};
|
||||
$this->config->version = $editionName . str_replace(array('max', 'biz'), '', $this->config->version);
|
||||
}
|
||||
|
||||
$canDelFile = is_writable($this->app->getAppRoot() . 'www');
|
||||
$installFile = $this->app->getAppRoot() . 'www/install.php';
|
||||
|
||||
@@ -14,15 +14,6 @@ set::zui(true);
|
||||
|
||||
$successLabel = ($installFileDeleted ? $lang->install->successLabel : $lang->install->successNoticeLabel);
|
||||
|
||||
if(trim($config->visions, ',') == 'lite')
|
||||
{
|
||||
$versionName = $lang->liteName . $config->liteVersion;
|
||||
}
|
||||
else
|
||||
{
|
||||
$versionName = $lang->pmsName . $config->version;
|
||||
}
|
||||
|
||||
jsVar('sendEventLink', $sendEventLink);
|
||||
|
||||
|
||||
@@ -60,7 +51,7 @@ div
|
||||
),
|
||||
cell(
|
||||
setClass('flex'),
|
||||
html(nl2br(sprintf($successLabel, $versionName)))
|
||||
html(nl2br(sprintf($successLabel, $config->version)))
|
||||
),
|
||||
),
|
||||
cell
|
||||
|
||||
Reference in New Issue
Block a user