From b597728a081991c648168cac9308ccd5ee999889 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 5 Aug 2015 21:15:31 +0200 Subject: [PATCH 1/2] add changelog entry for 4.3.20 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index d54bf2b04..04199ade1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ - MyDocumets: list only documents to approve which have passed review - show preview image in Review/Approval summary - timeout for external commands for creating fulltext index can be set +- add translations for korean -------------------------------------------------------------------------------- Changes in version 4.3.19 From 81872f4319d1f3b6b95758af71e91ec7ea1df18c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 5 Aug 2015 21:19:00 +0200 Subject: [PATCH 2/2] unset homefolder of users before the folder will be deleted --- SeedDMS_Core/Core/inc.ClassFolder.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 2230c3c83..175a651c4 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -856,8 +856,14 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { protected function removeFromDatabase() { /* {{{ */ $db = $this->_dms->getDB(); - //Entfernen der Datenbankeinträge $db->startTransaction(); + // unset homefolder as it will no longer exist + $queryStr = "UPDATE tblUsers SET homefolder=NULL WHERE homefolder = " . $this->_id; + if (!$db->getResult($queryStr)) { + $db->rollbackTransaction(); + return false; + } + // Remove database entries $queryStr = "DELETE FROM tblFolders WHERE id = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction();