Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

13 years ago · 87f2696e6a
parent 009bbef17e c7dc6dc2c2
commit 87f2696e6a
1 changed files with 1 additions and 1 deletions
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@ -461,7 +461,7 @@ class Util {
 			$relPath = Helper::stripUserFilesPath($path);
 		}

-		$fileKey = Keymanager::getFileKey($this->view, $relPath);
+		$fileKey = Keymanager::getFileKey($this->view, $this, $relPath);

 		if ($fileKey === false) {
 			return false;