From 48eee0b4324637a521b84648172131e2d5f10974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 3 Jun 2014 11:43:28 +0200 Subject: [PATCH] use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface --- 3rdparty | 2 +- lib/private/connector/sabre/file.php | 9 --------- lib/private/connector/sabre/principal.php | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/3rdparty b/3rdparty index 255f5e45c92..045dde529e0 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 255f5e45c927c7d4af39c9e8aa0b1506689aadd9 +Subproject commit 045dde529e050316788a63cd0067a38bbc6921b0 diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 6f12a45406c..4e90d46ad41 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -117,15 +117,6 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e); } - // rename to correct path - $renameOkay = $this->fileView->rename($partpath, $this->path); - $fileExists = $this->fileView->file_exists($this->path); - if ($renameOkay === false || $fileExists === false) { - \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR); - $this->fileView->unlink($partpath); - throw new \Sabre\DAV\Exception('Could not rename part file to final file'); - } - // allow sync clients to send the mtime along in a header $mtime = OC_Request::hasModificationTime(); if ($mtime !== false) { diff --git a/lib/private/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php index 83cfcbb3a13..9bad3b9df16 100644 --- a/lib/private/connector/sabre/principal.php +++ b/lib/private/connector/sabre/principal.php @@ -7,7 +7,7 @@ * See the COPYING-README file. */ -class OC_Connector_Sabre_Principal implements Sabre\DAVACL\IPrincipalBackend { +class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\BackendInterface { /** * Returns a list of principals based on a prefix. *