Merge pull request #4140 from nextcloud/no_encryption_no_wrapper

Don't add the Encryption Storage Wrapper if there are no encryption modules
nextcloud · Mar 31, 2017 · 85da937 · 85da937
2 parents 6a6300b + 7d4c422
commit 85da937
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -254,8 +254,11 @@ public function getDefaultEncryptionModuleId() {
 	 * 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);
+		}
 	}