aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/files/storage
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-05-11 10:35:42 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2015-05-11 12:06:57 +0200
commit0d5c7a11e287f44ad556d29b952c57c9ec11dfaa (patch)
tree40f6ac27a0253b13e392fae44dce5843fa13fe4b /lib/private/files/storage
parentebf3953908a8dfdb754a5031d69326c6b83cf609 (diff)
downloadnextcloud-server-0d5c7a11e287f44ad556d29b952c57c9ec11dfaa.tar.gz
nextcloud-server-0d5c7a11e287f44ad556d29b952c57c9ec11dfaa.zip
use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we
are in the storage wrapper the file cache isn't up-to-date
Diffstat (limited to 'lib/private/files/storage')
-rw-r--r--lib/private/files/storage/wrapper/encryption.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index c0c4c6979c2..c42e6d439fd 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -231,13 +231,7 @@ class Encryption extends Wrapper {
if (isset($this->unencryptedSize[$source])) {
$this->unencryptedSize[$target] = $this->unencryptedSize[$source];
}
- $keysRenamed = $this->keyStorage->renameKeys($source, $target);
- if ($keysRenamed &&
- dirname($source) !== dirname($target) &&
- $this->util->isFile($target)
- ) {
- $this->update->update($target);
- }
+ $this->keyStorage->renameKeys($source, $target);
}
}