sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly check for new default root 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/17062/head
Joas Schilling 2019-09-04 09:28:58 +07:00 committed by Backportbot
parent c2dede03bd
commit f7163bf638
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_sharing/lib/Cache.php
Unescape Escape View File

@ -67,12 +67,12 @@ class Cache extends CacheJail {
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
@ -138,7 +138,7 @@ class Cache extends CacheJail {
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;