gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-30 05:27:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-08-05 21:32:53 +02:00
commit 170f70d005
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -5,6 +5,7 @@
- MyDocumets: list only documents to approve which have passed review - MyDocumets: list only documents to approve which have passed review
- show preview image in Review/Approval summary - show preview image in Review/Approval summary
- timeout for external commands for creating fulltext index can be set - timeout for external commands for creating fulltext index can be set
- add translations for korean
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.19 Changes in version 4.3.19

8
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -858,8 +858,14 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
protected function removeFromDatabase() { /* {{{ */ protected function removeFromDatabase() { /* {{{ */
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
//Entfernen der Datenbankeinträge
$db->startTransaction(); $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; $queryStr = "DELETE FROM tblFolders WHERE id = " . $this->_id;
if (!$db->getResult($queryStr)) { if (!$db->getResult($queryStr)) {
$db->rollbackTransaction(); $db->rollbackTransaction();