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

Merge branch dev/bug-63515 of zentao/zentaopms (#9906)

Browse Source
This commit is contained in:
刘刚
2025-06-25 14:21:00 +08:00
committed by Gitfox
parent 81724ba462 dac116188c
commit 2ff7fe8ed6
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+1 -7
View File
@@ -11013,17 +11013,11 @@ class upgradeModel extends model
$docContent = $this->dao->select('*')->from(TABLE_DOCCONTENT)->where('doc')->eq($docID)->andWhere('version')->eq($version)->fetch();
if(empty($docContent)) return false;
if($docContent->type == 'markdown')
{
$this->loadModel('action')->create('docTemplate', $docID, 'convertDocTemplate', '', '', 'system');
return true;
}
$this->app->loadLang('doc');
$newDocContent = clone $docContent;
$newDocContent->version = $docContent->version + 1;
$newDocContent->type = 'doc';
$newDocContent->rawContent = json_encode(array('$migrate' => 'html', '$data' => $docContent->content));
$newDocContent->rawContent = json_encode(array('$migrate' => $docContent->type == 'markdown' ? 'markdown' : 'html', '$data' => $docContent->content));
$newDocContent->addedBy = 'system';
$newDocContent->addedDate = helper::now();
$newDocContent->editedBy = 'system';