wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly check for new default root

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2019-09-04 09:28:58 +02:00
parent 64c63bb00b
commit 70807a74c7
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
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
View file

@ -67,12 +67,12 @@ class Cache extends CacheJail {
parent::__construct( parent::__construct(
null, null,
'' ''
); );
} }
protected function getRoot() { protected function getRoot() {
if (is_null($this->root)) { if ($this->root === '') {
$absoluteRoot = $this->sourceRootInfo->getPath(); $absoluteRoot = $this->sourceRootInfo->getPath();
// the sourceRootInfo path is the absolute path of the folder in the "real" storage // 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) { protected function formatCacheEntry($entry, $path = null) {
if (is_null($path)) { if (is_null($path)) {
$path = isset($entry['path']) ? $entry['path'] : ''; $path = $entry['path'] ?? '';
$entry['path'] = $this->getJailedPath($path); $entry['path'] = $this->getJailedPath($path);
} else { } else {
$entry['path'] = $path; $entry['path'] = $path;