diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-03 11:43:28 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-04 17:47:09 +0200 |
| commit | 48eee0b4324637a521b84648172131e2d5f10974 (patch) | |
| tree | f5609060869dc8d42c40019eba139b64ed50f09d /lib | |
| parent | 76e04027bcc8f02aa665b960e229882f04986ee7 (diff) | |
| download | nextcloud-server-48eee0b4324637a521b84648172131e2d5f10974.tar.gz nextcloud-server-48eee0b4324637a521b84648172131e2d5f10974.zip | |
use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/connector/sabre/file.php | 9 | ||||
| -rw-r--r-- | lib/private/connector/sabre/principal.php | 2 |
2 files changed, 1 insertions, 10 deletions
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. * |