diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-25 11:47:06 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-04-25 11:47:06 +0200 |
| commit | 6c20a014eaecd19c3f68143485c6f74891ee9643 (patch) | |
| tree | 84bd8e37536e7f28a25afd7586c209d38a25d610 /lib/private/files/filesystem.php | |
| parent | cd0c5990f895bcdce47acf2dbf11ebadd920a404 (diff) | |
| parent | 3fc809dfd80a296d7da922a06f9e13d446b3d3f0 (diff) | |
| download | nextcloud-server-6c20a014eaecd19c3f68143485c6f74891ee9643.tar.gz nextcloud-server-6c20a014eaecd19c3f68143485c6f74891ee9643.zip | |
merge master into webdav-injection
Diffstat (limited to 'lib/private/files/filesystem.php')
| -rw-r--r-- | lib/private/files/filesystem.php | 3 |
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(); } |