[Pkg-owncloud-commits] [owncloud] 120/223: Fix checking for external share in encryption
David Prévot
taffit at moszumanska.debian.org
Sun Jun 22 01:54:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 790d51ea1efeb17c55870a5659a6f49e518d0ebe
Author: Robin Appelman <icewind at owncloud.com>
Date: Tue Jun 10 12:38:19 2014 +0200
Fix checking for external share in encryption
---
apps/files_encryption/lib/proxy.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 126a593..b1af467 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -64,7 +64,10 @@ class Proxy extends \OC_FileProxy {
// we don't encrypt server-to-server shares
list($storage, ) = \OC\Files\Filesystem::resolvePath($path);
- if ($storage instanceof OCA\Files_Sharing\External\Storage) {
+ /**
+ * @var \OCP\Files\Storage $storage
+ */
+ if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
return true;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list