[Pkg-owncloud-commits] [owncloud] 119/223: if file doesn't exist, check parent folder

[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 277f25222a3a97d8140a9dbc77f517fe74705b5f
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Tue Jun 10 12:26:43 2014 +0200

    if file doesn't exist, check parent folder
---
 apps/files_encryption/lib/proxy.php | 6 ++++++
 config/.htaccess                    | 0
 2 files changed, 6 insertions(+)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 51de8fc..126a593 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -51,11 +51,17 @@ class Proxy extends \OC_FileProxy {
 	 */
 	private function isExcludedPath($path, $uid) {
 
+		$view = new \OC\Files\View();
+
 		// files outside of the files-folder are excluded
 		if(strpos($path, '/' . $uid . '/files') !== 0) {
 			return true;
 		}
 
+		if (!$view->file_exists($path)) {
+			$path = dirname($path);
+		}
+
 		// we don't encrypt server-to-server shares
 		list($storage, ) = \OC\Files\Filesystem::resolvePath($path);
 		if ($storage instanceof OCA\Files_Sharing\External\Storage) {
diff --git a/config/.htaccess b/config/.htaccess
old mode 100644
new mode 100755

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