From 86144129085e19d8180161efeaf8f5b515b9e1df Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Nov 2014 15:08:37 +0100 Subject: [PATCH] check if SeedDMS_Core_DMS::forceRename is set --- SeedDMS_Core/Core/inc.ClassDocument.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 509d362ea..6e1dbf7cc 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -1144,7 +1144,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $db->rollbackTransaction(); return false; } - if (!SeedDMS_Core_File::copyFile($tmpFile, $this->_dms->contentDir . $dir . $version . $fileType)) { + if($this->_dms->forceRename) + $err = SeedDMS_Core_File::renameFile($tmpFile, $this->_dms->contentDir . $dir . $version . $fileType); + else + $err = SeedDMS_Core_File::copyFile($tmpFile, $this->_dms->contentDir . $dir . $version . $fileType); + if (!$err) { $db->rollbackTransaction(); return false; } @@ -1584,7 +1588,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ // copy file if (!SeedDMS_Core_File::makeDir($this->_dms->contentDir . $dir)) return false; - if (!SeedDMS_Core_File::copyFile($tmpFile, $this->_dms->contentDir . $file->getPath() )) return false; + if($this->_dms->forceRename) + $err = SeedDMS_Core_File::renameFile($tmpFile, $this->_dms->contentDir . $file->getPath()); + else + $err = SeedDMS_Core_File::copyFile($tmpFile, $this->_dms->contentDir . $file->getPath()); + if (!$err) return false; return true; } /* }}} */