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

CHANGELOG

@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.18
+--------------------------------------------------------------------------------
+- merge changes up to 5.1.25
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.17
 --------------------------------------------------------------------------------
@@ -207,6 +212,10 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.25
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.24
 --------------------------------------------------------------------------------

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -460,7 +460,7 @@ class SeedDMS_Core_DMS {
 		$this->lasterror = '';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.17';
+			$this->version = '6.0.18';
 	} /* }}} */
 
 	/**

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2021-09-22</date>
+ <date>2021-12-11</date>
  <time>13:44:55</time>
  <version>
-  <release>6.0.17</release>
+  <release>6.0.18</release>
-  <api>6.0.17</api>
+  <api>6.0.18</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- all changes from 5.1.24
+- all changes from 5.1.25
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1919,6 +1919,37 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - add new method SeedDMS_Core_User::getDocumentLinks()
 - add new type 'foldersperuser' to method SeedDMS_Core_DMS::getStatisticalData()
    </notes>
+ </release>
+  <release>
+   <date>2021-12-11</date>
+   <time>13:44:55</time>
+   <version>
+    <release>5.1.24</release>
+    <api>5.1.24</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- in SeedDMS_Core_DocumentContent::removeWorkflow() remove records from tblWorklflowLog before tblDWorkflowDocumentContent
+- make all class variables of SeedDMS_Core_User protected
+- fix various errors in SeedDMS_Core_AttributeDefinition::validate()
+- add lots of unit tests
+- replace incorrect use of array_search() by in_array()
+- move method SeedDMS_Core_DMS::createDump() into SeedDMS_Core_DatabaseAccess
+- lots of parameter checking when calling methods()
+- make sure callbacks are callable
+- SeedDMS_Core_Folder::getParent() returns null if there is no parent (used to be false)
+- SeedDMS_Core_DMS::search() will not find document without an expiration date anymore, if the search is limited by an expiration end date but no start date
+- add method SeedDMS_Core_Folder::getFoldersMinMax()
+- init internal cache variables of SeedDMS_Core_Folder/SeedDMS_Core_Document and add method clearCache()
+- SeedDMS_Core_Folder::hasDocuments() does not use the interal document cache anymore
+- SeedDMS_Core_Document::addDocumentLink() returns an object of type SeedDMS_Core_DocumentLink in case of success
+- trim email, comment, language, theme when setting data of user
+- more checks whether an id > 0 when getting a database record
+   </notes>
   </release>
   <release>
    <date>2021-08-20</date>
@@ -2268,5 +2299,21 @@ better error checking in SeedDMS_Core_Document::cancelCheckOut()
    <notes>
    </notes>
   </release>
+  <release>
+   <date>2021-12-11</date>
+   <time>13:44:55</time>
+   <version>
+    <release>6.0.17</release>
+    <api>6.0.17</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 5.1.24
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "6.0.17";
+	const _number = "6.0.18";
 	const _string = "SeedDMS";
 
 	function __construct() {