From ac392457f24aed34dc2c5635d9ffd64ec256b061 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Mon, 29 Feb 2016 10:29:48 +0100
Subject: [PATCH] Fix unit tests
---
apps/dav/lib/connector/sabre/file.php | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/apps/dav/lib/connector/sabre/file.php b/apps/dav/lib/connector/sabre/file.php
index b71c4ccc62..0bf7d9cf2b 100644
--- a/apps/dav/lib/connector/sabre/file.php
+++ b/apps/dav/lib/connector/sabre/file.php
@@ -215,6 +215,8 @@ class File extends Node implements IFile {
}
}
+ $this->refreshInfo();
+
if (isset($request->server['HTTP_OC_CHECKSUM'])) {
$checksum = trim($request->server['HTTP_OC_CHECKSUM']);
$this->fileView->putFileInfo($this->path, ['checksum' => $checksum]);
@@ -457,17 +459,17 @@ class File extends Node implements IFile {
$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_SHARED);
+ $this->emitPostHooks($exists, $targetPath);
+
+ $info = $this->fileView->getFileInfo($targetPath);
+
if (isset($request->server['HTTP_OC_CHECKSUM'])) {
$checksum = trim($request->server['HTTP_OC_CHECKSUM']);
$this->fileView->putFileInfo($targetPath, ['checksum' => $checksum]);
- } else if ($this->getChecksum() !== NULL && $this->getChecksum() !== '') {
+ } else if ($info->getChecksum() !== NULL && $info->getChecksum() !== '') {
$this->fileView->putFileInfo($this->path, ['checksum' => '']);
}
- $this->refreshInfo();
-
- $this->emitPostHooks($exists, $targetPath);
- $info = $this->fileView->getFileInfo($targetPath);
$this->fileView->unlockFile($targetPath, ILockingProvider::LOCK_SHARED);
--
GitLab