diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-03-11 09:36:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 09:36:57 +0100 |
| commit | 24d0fb9fcd8b190b6c16c4608c95785036b1eb31 (patch) | |
| tree | 4bd0fc659248dc52b4a2a7108f55c29210012f25 | |
| parent | 56c5a167c91fee18889d38b51fc6f31f1c2a995c (diff) | |
| parent | 886293fdcc3a6875c2670b5f43f488a31efc937f (diff) | |
| download | nextcloud-server-24d0fb9fcd8b190b6c16c4608c95785036b1eb31.tar.gz nextcloud-server-24d0fb9fcd8b190b6c16c4608c95785036b1eb31.zip | |
Merge pull request #19861 from nextcloud/bugfix/noid/load-remote-shares-also-when-one-is-down
Don't break when one remote share is down
| -rw-r--r-- | apps/files_sharing/lib/Controller/RemoteController.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Controller/RemoteController.php b/apps/files_sharing/lib/Controller/RemoteController.php index f420d695746..499c6d9c2e6 100644 --- a/apps/files_sharing/lib/Controller/RemoteController.php +++ b/apps/files_sharing/lib/Controller/RemoteController.php @@ -117,6 +117,10 @@ class RemoteController extends OCSController { $view = new \OC\Files\View('/' . \OC_User::getUser() . '/files/'); $info = $view->getFileInfo($share['mountpoint']); + if ($info === false) { + return $share; + } + $share['mimetype'] = $info->getMimetype(); $share['mtime'] = $info->getMTime(); $share['permissions'] = $info->getPermissions(); |