gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2022-02-21 16:02:48 +01:00
commit 673bc9ec7d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -222,6 +222,7 @@
- send notification mail to owner of document and uploader of a version - send notification mail to owner of document and uploader of a version
- new mail body for changing a version comment - new mail body for changing a version comment
- add hook documentListPreview - add hook documentListPreview
- various improvements for workflows
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.24 Changes in version 5.1.24

4
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -239,7 +239,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$this->_expires = $expires; $this->_expires = $expires;
$this->_ownerID = $ownerID; $this->_ownerID = $ownerID;
$this->_folderID = $folderID; $this->_folderID = $folderID;
$this->_inheritAccess = $inheritAccess; $this->_inheritAccess = $inheritAccess ? true : false;
$this->_defaultAccess = $defaultAccess; $this->_defaultAccess = $defaultAccess;
$this->_locked = ($locked == null || $locked == '' ? -1 : $locked); $this->_locked = ($locked == null || $locked == '' ? -1 : $locked);
$this->_keywords = $keywords; $this->_keywords = $keywords;
@ -847,7 +847,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
if (!$db->getResult($queryStr)) if (!$db->getResult($queryStr))
return false; return false;
$this->_inheritAccess = ($inheritAccess ? "1" : "0"); $this->_inheritAccess = ($inheritAccess ? true : false);
if(!$noclean) if(!$noclean)
$this->cleanNotifyList(); $this->cleanNotifyList();