mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-31 13:18:06 +00:00 
			
		
		
		
	Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
		
						commit
						673bc9ec7d
					
				|  | @ -222,6 +222,7 @@ | |||
| - send notification mail to owner of document and uploader of a version | ||||
| - new mail body for changing a version comment | ||||
| - add hook documentListPreview | ||||
| - various improvements for workflows | ||||
| 
 | ||||
| -------------------------------------------------------------------------------- | ||||
|                      Changes in version 5.1.24 | ||||
|  |  | |||
|  | @ -239,7 +239,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ | |||
| 		$this->_expires = $expires; | ||||
| 		$this->_ownerID = $ownerID; | ||||
| 		$this->_folderID = $folderID; | ||||
| 		$this->_inheritAccess = $inheritAccess; | ||||
| 		$this->_inheritAccess = $inheritAccess ? true : false; | ||||
| 		$this->_defaultAccess = $defaultAccess; | ||||
| 		$this->_locked = ($locked == null || $locked == '' ? -1 : $locked); | ||||
| 		$this->_keywords = $keywords; | ||||
|  | @ -847,7 +847,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ | |||
| 		if (!$db->getResult($queryStr)) | ||||
| 			return false; | ||||
| 
 | ||||
| 		$this->_inheritAccess = ($inheritAccess ? "1" : "0"); | ||||
| 		$this->_inheritAccess = ($inheritAccess ? true : false); | ||||
| 
 | ||||
| 		if(!$noclean) | ||||
| 			$this->cleanNotifyList(); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann