From 61a6adff143b405dd5e0f2fe3785286692126f0c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 24 Jul 2017 21:14:06 +0200 Subject: Fix sabre test Signed-off-by: Roeland Jago Douma --- apps/dav/lib/Connector/Sabre/FilesPlugin.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index d4aa277fdc8..726dd13cced 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -201,11 +201,13 @@ class FilesPlugin extends ServerPlugin { if ($sourceDir !== $destinationDir) { $sourceNodeFileInfo = $sourceNode->getFileInfo(); - if ($sourceNodeFileInfo !== null && !$sourceNodeFileInfo->isDeletable()) { + if ($sourceNodeFileInfo === null) { + throw new NotFound($source . ' does not exist'); + } + + if (!$sourceNodeFileInfo->isDeletable()) { throw new Forbidden($source . " cannot be deleted"); } - - throw new NotFound($source . ' does not exist'); } } -- cgit v1.2.3