summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2017-06-15 13:59:06 +0200
committerRobin Appelman <robin@icewind.nl>2017-06-15 13:59:06 +0200
commitfa817599170e81b0eb28cb59446c32f0b5645f03 (patch)
tree62ec6b77ecff2bd91d74797b96f01c6b5cbab562 /lib
parenta74901fce17da6d88dbb82373fff523b834d692d (diff)
downloadnextcloud-server-fa817599170e81b0eb28cb59446c32f0b5645f03.tar.gz
nextcloud-server-fa817599170e81b0eb28cb59446c32f0b5645f03.zip
fix moving folders out of a cache jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Cache/Wrapper/CacheJail.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index ebab20fbaed..8f12ca77ee6 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -94,7 +94,7 @@ class CacheJail extends CacheWrapper {
* get the stored metadata of a file or folder
*
* @param string /int $file
- * @return array|false
+ * @return ICacheEntry|false
*/
public function get($file) {
if (is_string($file) or $file == '') {
@@ -176,6 +176,16 @@ class CacheJail extends CacheWrapper {
}
/**
+ * Get the storage id and path needed for a move
+ *
+ * @param string $path
+ * @return array [$storageId, $internalPath]
+ */
+ protected function getMoveInfo($path) {
+ return [$this->getNumericStorageId(), $this->getSourcePath($path)];
+ }
+
+ /**
* remove all entries for files that are stored on the storage from the cache
*/
public function clear() {