summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricewind1991 <robin@icewind.nl>2014-04-23 14:13:44 +0200
committericewind1991 <robin@icewind.nl>2014-04-23 14:13:44 +0200
commitc8801a41d871ae4633a6760a98dcdca71af92886 (patch)
tree5f4439448d97f14859832ad2a8139715caf19e99
parent704b9e6a0d94a5c056214e92784d2e872ef83185 (diff)
parent3d0661a1e79d48ff68a1302126a30e78a9732fa4 (diff)
downloadnextcloud-server-c8801a41d871ae4633a6760a98dcdca71af92886.tar.gz
nextcloud-server-c8801a41d871ae4633a6760a98dcdca71af92886.zip
Merge pull request #8324 from owncloud/expired-link-error
Fix error when viewing expired link
-rw-r--r--lib/private/files/filesystem.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 7e27650c557..434ee495870 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -374,6 +374,9 @@ class Filesystem {
* Returns path like /admin/files
*/
static public function getRoot() {
+ if (!self::$defaultInstance) {
+ return null;
+ }
return self::$defaultInstance->getRoot();
}