Skip to content

[stable17] Properly initialize the CacheJail for sharing #17060

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
rullzer merged 2 commits into from
Sep 16, 2019
Merged

[stable17] Properly initialize the CacheJail for sharing #17060

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f3802a
Properly initialize the CacheJail for sharing
juliusknorr Sep 3, 2019
98548b1
Correctly check for new default root
nickvergessen Sep 4, 2019
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
Prev Previous commit
Correctly check for new default root 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen authored and Backportbot committed Sep 9, 2019
commit 98548b1c441a7095b8eb1c4b990ec5b571fea7bb
6 changes: 3 additions & 3 deletions apps/files_sharing/lib/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ public function __construct($storage, ICacheEntry $sourceRootInfo) {

parent::__construct(
null,
''
''
);
}

protected function getRoot() {
if (is_null($this->root)) {
if ($this->root === '') {
$absoluteRoot = $this->sourceRootInfo->getPath();

// the sourceRootInfo path is the absolute path of the folder in the "real" storage
Expand Down Expand Up @@ -138,7 +138,7 @@ public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath,

protected function formatCacheEntry($entry, $path = null) {
if (is_null($path)) {
$path = isset($entry['path']) ? $entry['path'] : '';
$path = $entry['path'] ?? '';
$entry['path'] = $this->getJailedPath($path);
} else {
$entry['path'] = $path;
Expand Down