diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-06-25 21:43:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 21:43:37 +0200 |
| commit | 2f5810f26ec9aaeece011953979def8cfd94f452 (patch) | |
| tree | e5dfe56537169dec54339fb0799856fc8c2ab5a7 | |
| parent | 0f0dfc837e24e30b461e60dc7ec93b16e55c9bb3 (diff) | |
| parent | 9dac9710e4c87ca87b857bfd9cbd1eb5841cc2ca (diff) | |
| download | nextcloud-server-2f5810f26ec9aaeece011953979def8cfd94f452.tar.gz nextcloud-server-2f5810f26ec9aaeece011953979def8cfd94f452.zip | |
Merge pull request #15832 from nextcloud/bugfix/noid/fulltext-search-groupfolders
Fix full text search for groupfolders
| -rw-r--r-- | lib/private/Files/View.php | 4 | ||||
| -rw-r--r-- | lib/private/Share20/Manager.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 2516b782ee7..8322576c5c2 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1933,7 +1933,7 @@ class View { if ($mount) { try { $storage = $mount->getStorage(); - if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { $storage->acquireLock( $mount->getInternalPath($absolutePath), $type, @@ -1974,7 +1974,7 @@ class View { if ($mount) { try { $storage = $mount->getStorage(); - if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { $storage->changeLock( $mount->getInternalPath($absolutePath), $type, diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index e71b6f98321..df9a06e3a96 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1430,6 +1430,9 @@ class Manager implements IManager { if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) { $nodes = $userFolder->getById($path->getId()); $path = array_shift($nodes); + if ($path->getOwner() === null) { + return []; + } $owner = $path->getOwner()->getUID(); } |