]> source.dussan.org Git - nextcloud-server.git/commitdiff
check if it is a cached file or a version to resolve the correct path to the file key
authorBjoern Schiessle <schiessle@owncloud.com>
Wed, 20 Nov 2013 11:34:23 +0000 (12:34 +0100)
committerBjoern Schiessle <schiessle@owncloud.com>
Wed, 20 Nov 2013 11:34:23 +0000 (12:34 +0100)
apps/files_encryption/lib/util.php

index 4f27c2b00fb1811e921279150a2089846fdb3319..b208a808bacb705c60e04589db146e4d7b230e98 100644 (file)
@@ -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);