Merge pull request #20060 from owncloud/cache-move-final-update-trans…

…action include the final update in the transaction when moving a folder in the cache
owncloud · Oct 29, 2015 · c30a68e · c30a68e
2 parents d7efb6d + 01d3393
commit c30a68e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
@@ -485,6 +485,9 @@ public function moveFromCache(Cache $sourceCache, $sourcePath, $targetPath) {
 		list($sourceStorageId, $sourcePath) = $sourceCache->getMoveInfo($sourcePath);
 		list($targetStorageId, $targetPath) = $this->getMoveInfo($targetPath);
 
+		// sql for final update
+		$moveSql = 'UPDATE `*PREFIX*filecache` SET `storage` =  ?, `path` = ?, `path_hash` = ?, `name` = ?, `parent` =? WHERE `fileid` = ?';
+
 		if ($sourceData['mimetype'] === 'httpd/unix-directory') {
 			//find all child entries
 			$sql = 'SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path` LIKE ?';
@@ -498,11 +501,12 @@ public function moveFromCache(Cache $sourceCache, $sourcePath, $targetPath) {
 				$newTargetPath = $targetPath . substr($child['path'], $sourceLength);
 				\OC_DB::executeAudited($query, [$targetStorageId, $newTargetPath, md5($newTargetPath), $child['fileid']]);
 			}
+			\OC_DB::executeAudited($moveSql, [$targetStorageId, $targetPath, md5($targetPath), basename($targetPath), $newParentId, $sourceId]);
 			\OC_DB::commit();
+		} else {
+			\OC_DB::executeAudited($moveSql, [$targetStorageId, $targetPath, md5($targetPath), basename($targetPath), $newParentId, $sourceId]);
 		}
 
-		$sql = 'UPDATE `*PREFIX*filecache` SET `storage` =  ?, `path` = ?, `path_hash` = ?, `name` = ?, `parent` =? WHERE `fileid` = ?';
-		\OC_DB::executeAudited($sql, [$targetStorageId, $targetPath, md5($targetPath), basename($targetPath), $newParentId, $sourceId]);
 	}
 
 	/**