[Pkg-owncloud-commits] [owncloud] 34/50: Reenable file proxy when renaming between mount points

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit 3ec5cbb347c4260c655d609306a8f1908078d6f0
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Sep 18 19:21:04 2014 +0200

    Reenable file proxy when renaming between mount points
    
    When moving a folder into another mount point, $renamedFiles is empty
    because that goes over a different mechanism.
    
    In such case, this fix makes sure that the file proxy is reenable to
    avoid breaking the subsequent files that are being moved.
---
 apps/files_encryption/hooks/hooks.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index f843d8a..a7576e6 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -570,7 +570,8 @@ class Hooks {
 			$type = self::$renamedFiles[$params['oldpath']]['type'];
 			unset(self::$renamedFiles[$params['oldpath']]);
 		} else {
-			\OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::ERROR);
+			\OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::DEBUG);
+			\OC_FileProxy::$enabled = $proxyStatus;
 			return false;
 		}
 

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