[Pkg-owncloud-commits] [owncloud] 93/111: check if it is a cached file or a version to resolve the correct path to the file key

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit f3e2a63712e3306c5bb1cad1921da4a3ff542474
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Nov 20 12:34:23 2013 +0100

    check if it is a cached file or a version to resolve the correct path to the file key
---
 apps/files_encryption/lib/util.php |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 4f27c2b..b208a80 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -472,7 +472,11 @@ class Util {
 	 */
 	public function isEncryptedPath($path) {
 
-		$relPath = Helper::stripUserFilesPath($path);
+		$relPath = Helper::getPathToRealFile($path);
+
+		if ($relPath === false) {
+			$relPath = Helper::stripUserFilesPath($path);
+		}
 
 		$fileKey = Keymanager::getFileKey($this->view, $relPath);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git