diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-09-18 21:21:04 +0400 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-09-23 15:35:45 +0400 |
| commit | 3ec5cbb347c4260c655d609306a8f1908078d6f0 (patch) | |
| tree | aca4515548646925c7d947ec5e2a391f5f44f41d | |
| parent | f2629142b07a38b11869116750177cd316da6064 (diff) | |
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.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index f843d8a9bf8..a7576e660ce 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;
}
|