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

check if SeedDMS_Core_DMS::forceRename is set

Browse Source
This commit is contained in:
Uwe Steinmann 2014-11-24 15:08:37 +01:00
parent 17269c2979
commit 8614412908
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -1144,7 +1144,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$db->rollbackTransaction(); $db->rollbackTransaction();
return false; 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(); $db->rollbackTransaction();
return false; return false;
} }
@ -1584,7 +1588,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
// copy file // copy file
if (!SeedDMS_Core_File::makeDir($this->_dms->contentDir . $dir)) return false; 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; return true;
} /* }}} */ } /* }}} */