diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-09-22 16:30:19 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-09-22 16:30:19 +0200 |
| commit | 70937dabcdf60a047000347523bfee7a53e673e6 (patch) | |
| tree | dbb4aa4519a221ea88c79f3cf91f8b292397d1d7 | |
| parent | 9e8d2907e2c86c1c425feefd5e5a97ed4325b040 (diff) | |
| parent | f2a01dddbce0069387905c7b62bbca6b0cf27a19 (diff) | |
| download | nextcloud-server-70937dabcdf60a047000347523bfee7a53e673e6.tar.gz nextcloud-server-70937dabcdf60a047000347523bfee7a53e673e6.zip | |
Merge pull request #11167 from owncloud/env-movetomountreenableproxy
Reenable file proxy when renaming between mount points
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index ccea51f91f7..a6b4882083b 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -487,6 +487,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;
}
|