Skip to content

[stable10] Fix cross storage moving filecache #28219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 3 commits into from
Jun 27, 2017
Merged

[stable10] Fix cross storage moving filecache #28219

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7340a11
Fix cross-storage move info when moving between two received shares
May 26, 2017
a3b5701
Trying to reproduce core#28018
SergioBertolinSG May 26, 2017
247782d
Improve tests
May 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix cross-storage move info when moving between two received shares 
Need to properly resolve the given path to a source path in
`getMoveInfo`. This was missing when adding this new method.
  • Loading branch information
Vincent Petry committed Jun 26, 2017
commit 7340a11664481516262ec4dc14eaaeade1124dd1
4 changes: 4 additions & 0 deletions lib/private/Files/Cache/Wrapper/CacheJail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,4 +311,8 @@ public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath,
}
return $this->cache->moveFromCache($sourceCache, $sourcePath, $this->getSourcePath($targetPath));
}

protected function getMoveInfo($path) {
return [$this->getNumericStorageId(), $this->getSourcePath($path)];
}
}