mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-30 20:51:22 +00:00 
			
		
		
		
	Merge branch 'seeddms-4.3.14' into develop
Conflicts: SeedDMS_Core/Core/inc.ClassFolder.php
This commit is contained in:
		
						commit
						1c0a2f37b4
					
				|  | @ -1,3 +1,8 @@ | |||
| -------------------------------------------------------------------------------- | ||||
|                      Changes in version 4.3.14 | ||||
| -------------------------------------------------------------------------------- | ||||
| - add missing start in transaction in SeedDMS_Core_Folder::remove() | ||||
| 
 | ||||
| -------------------------------------------------------------------------------- | ||||
|                      Changes in version 4.3.13 | ||||
| -------------------------------------------------------------------------------- | ||||
|  |  | |||
|  | @ -15,8 +15,8 @@ | |||
|  <date>2014-11-27</date> | ||||
|  <time>11:56:35</time> | ||||
|  <version> | ||||
|   <release>4.3.13</release> | ||||
|   <api>4.3.13</api> | ||||
|   <release>4.3.14</release> | ||||
|   <api>4.3.14</api> | ||||
|  </version> | ||||
|  <stability> | ||||
|   <release>stable</release> | ||||
|  | @ -24,10 +24,7 @@ | |||
|  </stability> | ||||
|  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license> | ||||
|  <notes> | ||||
| - fix searching for attributes | ||||
| - add some more documentation | ||||
| - SeedDMS_Core_DMS::getDocumentCategories() returns categories sorted by name (Bug #181) | ||||
| - new methode SeedDMS_Core_Document::replaceContent() which replaces the content of a version. | ||||
| - add missing start transaction in SeedDMD_Core_Folder::remove() | ||||
|  </notes> | ||||
|  <contents> | ||||
|   <dir baseinstalldir="SeedDMS" name="/"> | ||||
|  | @ -752,5 +749,24 @@ new release | |||
| - fix searching folders with multivalue attributes | ||||
|    </notes> | ||||
|   </release> | ||||
|   <release> | ||||
|    <date>2014-11-27</date> | ||||
|    <time>11:56:35</time> | ||||
|    <version> | ||||
|     <release>4.3.13</release> | ||||
|     <api>4.3.13</api> | ||||
|    </version> | ||||
|    <stability> | ||||
|     <release>stable</release> | ||||
|     <api>stable</api> | ||||
|    </stability> | ||||
|    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license> | ||||
|    <notes> | ||||
| - fix searching for attributes | ||||
| - add some more documentation | ||||
| - SeedDMS_Core_DMS::getDocumentCategories() returns categories sorted by name (Bug #181) | ||||
| - new methode SeedDMS_Core_Document::replaceContent() which replaces the content of a version. | ||||
|    </notes> | ||||
|   </release> | ||||
|  </changelog> | ||||
| </package> | ||||
|  |  | |||
|  | @ -25,6 +25,7 @@ include("../inc/inc.Init.php"); | |||
| include("../inc/inc.Extension.php"); | ||||
| include("../inc/inc.DBInit.php"); | ||||
| include("../inc/inc.ClassUI.php"); | ||||
| include("../inc/inc.ClassAccessOperation.php"); | ||||
| include("../inc/inc.Authentication.php"); | ||||
| 
 | ||||
| if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { | ||||
|  | @ -67,9 +68,13 @@ if(!$reviews) { | |||
| 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action")); | ||||
| } | ||||
| 
 | ||||
| /* Create object for checking access to certain operations */ | ||||
| $accessop = new SeedDMS_AccessOperation($document, $user, $settings); | ||||
| 
 | ||||
| $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); | ||||
| $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content)); | ||||
| if($view) { | ||||
| 	$view->setParam('accessobject', $accessop); | ||||
| 	$view->show(); | ||||
| 	exit; | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann