summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-09-18 19:21:04 +0200
committerVincent Petry <pvince81@owncloud.com>2014-09-18 19:21:04 +0200
commitf2a01dddbce0069387905c7b62bbca6b0cf27a19 (patch)
tree5a00c19a08cfee4ea24d76221d8ce87fdd8ee4f4
parentc89c6ed21de96be58793c0e63c39aa0897253450 (diff)
downloadnextcloud-server-f2a01dddbce0069387905c7b62bbca6b0cf27a19.tar.gz
nextcloud-server-f2a01dddbce0069387905c7b62bbca6b0cf27a19.zip
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.
-rw-r--r--apps/files_encryption/hooks/hooks.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index b1e7e8c52a5..1e605244f14 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -484,6 +484,7 @@ class Hooks {
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::DEBUG);
+ \OC_FileProxy::$enabled = $proxyStatus;
return false;
}