aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-09-04 09:28:58 +0200
committerJoas Schilling <coding@schilljs.com>2019-09-04 09:28:58 +0200
commit70807a74c744ae0b613f8f9441ca663e391569de (patch)
tree2dc0225ca48b408ec6ea0b8387960563a37675a1 /apps/files_sharing/lib
parent64c63bb00b855876694d141825b15b47d22b627e (diff)
downloadnextcloud-server-70807a74c744ae0b613f8f9441ca663e391569de.tar.gz
nextcloud-server-70807a74c744ae0b613f8f9441ca663e391569de.zip
Correctly check for new default root
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r--apps/files_sharing/lib/Cache.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php
index edd7ab3186f..e50e1661447 100644
--- a/apps/files_sharing/lib/Cache.php
+++ b/apps/files_sharing/lib/Cache.php
@@ -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;