From ec8d7010e54138f87a5c17216b6863188db136a4 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 29 Mar 2017 17:01:04 +0200 Subject: Accept moving FutureFile into a Directory --- apps/dav/lib/Connector/Sabre/Directory.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'apps/dav/lib/Connector') diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index a26420344d0..ddf324ce851 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -43,6 +43,7 @@ use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\INode; use Sabre\DAV\Exception\BadRequest; use OC\Files\Mount\MoveableMount; +use Sabre\DAV\IFile; class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { @@ -344,6 +345,11 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node */ public function moveInto($targetName, $fullSourcePath, INode $sourceNode) { if (!$sourceNode instanceof Node) { + // it's a file of another kind, like FutureFile + if ($sourceNode instanceof IFile) { + // fallback to default copy+delete handling + return false; + } throw new BadRequest('Incompatible node types'); } -- cgit v1.2.3