diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-30 22:10:04 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:28 +0200 |
| commit | 00338f9dca97fd7b48d96201fd607cf460c385ff (patch) | |
| tree | f88bfad7483e6b7432fdf4a2af5907efead59954 /lib | |
| parent | 99255ff3a92b2d242f3c723979341951a303f83d (diff) | |
| download | nextcloud-server-00338f9dca97fd7b48d96201fd607cf460c385ff.tar.gz nextcloud-server-00338f9dca97fd7b48d96201fd607cf460c385ff.zip | |
Removing files_encryption left overs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/connector/sabre/file.php | 2 | ||||
| -rw-r--r-- | lib/private/files.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 4fbcb732688..5b8cb17a81c 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -190,7 +190,7 @@ class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile { } else { try { return $this->fileView->fopen(ltrim($this->path, '/'), 'rb'); - } catch (\OCA\Files_Encryption\Exception\EncryptionException $e) { + } catch (\OCP\Encryption\Exception\EncryptionException $e) { throw new \Sabre\DAV\Exception\Forbidden($e->getMessage()); } catch (\OCP\Files\StorageNotAvailableException $e) { throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to open file: ".$e->getMessage()); diff --git a/lib/private/files.php b/lib/private/files.php index d0c1baa0c1e..97f9d8163b1 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -122,7 +122,7 @@ class OC_Files { if ($get_type === self::FILE) { $zip = false; - if ($xsendfile && OC_App::isEnabled('files_encryption')) { + if ($xsendfile && \OC::$server->getEncryptionManager()->isEnabled()) { $xsendfile = false; } } else { |