diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-04 17:16:36 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-04 17:16:36 +0100 |
| commit | 0580c232d72123ca7e3c675ed73268099d00d185 (patch) | |
| tree | f0cdabd0da075efa4667b0dd402e72c288f23915 /apps | |
| parent | 9323ba53b161fe56fcff5ea7bac14a731dd8db70 (diff) | |
| download | nextcloud-server-0580c232d72123ca7e3c675ed73268099d00d185.tar.gz nextcloud-server-0580c232d72123ca7e3c675ed73268099d00d185.zip | |
still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 3b9dcbe7767..31723ae7647 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -95,8 +95,7 @@ class Proxy extends \OC_FileProxy { // don't call the crypt stream wrapper, if... if ( - $session->getInitialized() !== Session::INIT_SUCCESSFUL // encryption successful initialized - || Crypt::mode() !== 'server' // we are not in server-side-encryption mode + Crypt::mode() !== 'server' // we are not in server-side-encryption mode || $this->isExcludedPath($path, $userId) // if path is excluded from encryption || substr($path, 0, 8) === 'crypt://' // we are already in crypt mode ) { |