mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-31 13:18:06 +00:00 
			
		
		
		
	Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
This commit is contained in:
		
						commit
						568e8a19e4
					
				|  | @ -1261,9 +1261,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ | |||
| 		unset($this->_content); | ||||
| 		unset($this->_latestContent); | ||||
| 		$content = $this->getLatestContent($contentID); | ||||
| //		$content = new SeedDMS_Core_DocumentContent($contentID, $this, $version, $comment, $date, $user->getID(), $dir, $orgFileName, $fileType, $mimeType, $filesize, $checksum);
 | ||||
| 		if($workflow) | ||||
| 			$content->setWorkflow($workflow, $user); | ||||
| 		$docResultSet = new SeedDMS_Core_AddContentResultSet($content); | ||||
| 		$docResultSet->setDMS($this->_dms); | ||||
| 
 | ||||
|  | @ -1293,6 +1290,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ | |||
| 
 | ||||
| 		$statusID = $db->getInsertID(); | ||||
| 
 | ||||
| 		if($workflow) | ||||
| 			$content->setWorkflow($workflow, $user); | ||||
| 
 | ||||
| 		// Add reviewers into the database. Reviewers must review the document
 | ||||
| 		// and submit comments, if appropriate. Reviewers can also recommend that
 | ||||
| 		// a document be rejected.
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann