diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-09 12:56:57 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-09 12:56:57 +0100 |
| commit | 26861a98c59c39901b9127831b7edf0c0a3eff40 (patch) | |
| tree | 47d8331ea605e3d37c27f4dcdd14b791220cba92 /lib | |
| parent | e61f24f2aae6163e09aa4462c9e2de4d592deb1a (diff) | |
| parent | b85e34c1da075ad551321541a4e75d0d3a7015a5 (diff) | |
| download | nextcloud-server-26861a98c59c39901b9127831b7edf0c0a3eff40.tar.gz nextcloud-server-26861a98c59c39901b9127831b7edf0c0a3eff40.zip | |
Merge pull request #12568 from owncloud/autoload-encryption-classes
Fix namespaces of encryption classes and encryption tests
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/connector/sabre/file.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index d93b8e68eb6..54eea54552f 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -104,7 +104,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ } catch (\OCP\Files\LockNotAcquiredException $e) { // the file is currently being written to by another process throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e); - } catch (\OCA\Encryption\Exception\EncryptionException $e) { + } catch (\OCA\Files_Encryption\Exception\EncryptionException $e) { throw new \Sabre\DAV\Exception\Forbidden($e->getMessage()); } catch (\OCP\Files\StorageNotAvailableException $e) { throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage()); @@ -166,7 +166,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ } else { try { return $this->fileView->fopen(ltrim($this->path, '/'), 'rb'); - } catch (\OCA\Encryption\Exception\EncryptionException $e) { + } catch (\OCA\Files_Encryption\Exception\EncryptionException $e) { throw new \Sabre\DAV\Exception\Forbidden($e->getMessage()); } catch (\OCP\Files\StorageNotAvailableException $e) { throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage()); |