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

* Adjust code.

Browse Source
This commit is contained in:
tianshujie98
2021-06-30 14:07:47 +08:00
parent fed23d507d
commit 48a545ea4d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+8 -4
View File
@@ -526,7 +526,7 @@ class docModel extends model
->remove('comment,files,labels,uid,contactListMenu')
->get();
if($doc->contentType == 'markdown') $doc->content = $this->post->content;
if($doc->acl == 'private') $doc->users = $oldDoc->addedBy;
if(!empty($doc->acl) and $doc->acl == 'private') $doc->users = $oldDoc->addedBy;
$oldDocContent = $this->dao->select('*')->from(TABLE_DOCCONTENT)->where('doc')->eq($docID)->andWhere('version')->eq($oldDoc->version)->fetch();
if($oldDocContent)
@@ -539,10 +539,14 @@ class docModel extends model
if($oldDocContent->type == 'markdown') $doc->content = str_replace('>', '>', $doc->content);
}
$lib = $this->getLibByID($doc->lib);
$lib = !empty($doc->lib) ? $this->getLibByID($doc->lib) : '';
$doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->edit['id'], $this->post->uid);
$doc->product = $lib->product;
$doc->execution = $lib->execution;
if(!empty($lib))
{
$doc->product = $lib->product;
$doc->execution = $lib->execution;
}
if(isset($doc->type) and $doc->type == 'url') $doc->content = $doc->url;
unset($doc->url);