Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

This commit is contained in:
Bjoern Schiessle 2013-11-21 11:18:53 +01:00
commit 87f2696e6a

View file

@ -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;