diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2017-03-31 14:49:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 14:49:38 +0200 |
| commit | 85da9378c0a46840b53d7c90bb88996bd62e7677 (patch) | |
| tree | 4ea023a4d8ede18ca8a1e419d014f73f56cb25dd | |
| parent | 6a6300b1f20116088c3d7e09d5e4d8a6ed6fc57e (diff) | |
| parent | 7d4c4224d109331fe10c147ac72fc3b0a3aaee32 (diff) | |
| download | nextcloud-server-85da9378c0a46840b53d7c90bb88996bd62e7677.tar.gz nextcloud-server-85da9378c0a46840b53d7c90bb88996bd62e7677.zip | |
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
Don't add the Encryption Storage Wrapper if there are no encryption modules
| -rwxr-xr-x | build/integration/run.sh | 2 | ||||
| -rw-r--r-- | lib/private/Encryption/Manager.php | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/build/integration/run.sh b/build/integration/run.sh index 282a4303395..45c2bcdaf2b 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -44,7 +44,7 @@ if [ "$INSTALLED" == "true" ]; then $OCC app:enable files_external mkdir -p work/local_storage - OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage` + OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=$PWD/work/local_storage` ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | tr ' ' '\n' | tail -n1` diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php index 4d40675801e..9053e371b65 100644 --- a/lib/private/Encryption/Manager.php +++ b/lib/private/Encryption/Manager.php @@ -254,8 +254,11 @@ class Manager implements IManager { * Add storage wrapper */ public function setupStorage() { - $encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger); - Filesystem::addStorageWrapper('oc_encryption', array($encryptionWrapper, 'wrapStorage'), 2); + // If encryption is disabled and there are no loaded modules it makes no sense to load the wrapper + if (!empty($this->encryptionModules) || $this->isEnabled()) { + $encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger); + Filesystem::addStorageWrapper('oc_encryption', array($encryptionWrapper, 'wrapStorage'), 2); + } } |