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

* finish task #3147 and update HTMLPurifier.

Browse Source
This commit is contained in:
wangyidong
2017-08-16 13:32:34 +08:00
parent d805329387
commit a25a10d542
379 changed files with 23099 additions and 21960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+2 -2
View File
@@ -456,7 +456,8 @@ class docModel extends model
->remove('comment,files,labels,uid')
->get();
if($doc->acl == 'private') $doc->users = $oldDoc->addedBy;
if($oldDoc->contentType == 'markdown') $doc->content = str_replace('>', '>', $doc->content);
$oldDocContent = $this->dao->select('files,type')->from(TABLE_DOCCONTENT)->where('doc')->eq($docID)->andWhere('version')->eq($oldDoc->version)->fetch();
if($oldDocContent->type == 'markdown') $doc->content = str_replace('>', '>', $doc->content);
$lib = $this->getLibByID($doc->lib);
$doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->edit['id'], $this->post->uid);
@@ -476,7 +477,6 @@ class docModel extends model
if($changed)
{
$oldDocContent = $this->dao->select('files,type')->from(TABLE_DOCCONTENT)->where('doc')->eq($docID)->andWhere('version')->eq($oldDoc->version)->fetch();
$doc->version = $oldDoc->version + 1;
$docContent = new stdclass();
$docContent->doc = $docID;