mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accept moving FutureFile into a Directory

This commit is contained in:
Vincent Petry 2017-03-29 17:01:04 +02:00 committed by Joas Schilling
parent 642b4331a6
commit ec8d7010e5
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/Connector/Sabre/Directory.php
View File

@ -43,6 +43,7 @@ use Sabre\DAV\Exception\ServiceUnavailable;
use Sabre\DAV\INode; use Sabre\DAV\INode;
use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\BadRequest;
use OC\Files\Mount\MoveableMount; use OC\Files\Mount\MoveableMount;
use Sabre\DAV\IFile;
class Directory extends \OCA\DAV\Connector\Sabre\Node class Directory extends \OCA\DAV\Connector\Sabre\Node
implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { 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) { public function moveInto($targetName, $fullSourcePath, INode $sourceNode) {
if (!$sourceNode instanceof Node) { 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'); throw new BadRequest('Incompatible node types');
} }