|
|
@@ -293,8 +293,6 @@ class Trashbin { |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
$connection = \OC::$server->getDatabaseConnection(); |
|
|
|
$connection->beginTransaction(); |
|
|
|
$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath); |
|
|
|
|
|
|
|
try { |
|
|
@@ -318,12 +316,16 @@ class Trashbin { |
|
|
|
} else { |
|
|
|
$sourceStorage->unlink($sourceInternalPath); |
|
|
|
} |
|
|
|
$connection->rollBack(); |
|
|
|
|
|
|
|
if ($sourceStorage->file_exists($sourceInternalPath)) { |
|
|
|
// undo the cache move |
|
|
|
$sourceStorage->getUpdater()->renameFromStorage($trashStorage, $trashInternalPath, $sourceInternalPath); |
|
|
|
} else { |
|
|
|
$trashStorage->getUpdater()->remove($trashInternalPath); |
|
|
|
} |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
$connection->commit(); |
|
|
|
|
|
|
|
if ($moveSuccessful) { |
|
|
|
$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); |
|
|
|
$result = $query->execute([$filename, $timestamp, $location, $owner]); |