diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-06-26 15:48:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 15:48:57 +0200 |
| commit | f63a2bfd9735c59ebf97b7ce505f1d2cb154d560 (patch) | |
| tree | 67b2f8db7c3683973e73470253f35e5f4f0a08f6 | |
| parent | 8d6625f5e8dff116fce18299b2420567f6bc4c20 (diff) | |
| parent | 9ad616e221f1a6e017b25bedcc9d57f9b0f46e21 (diff) | |
| download | nextcloud-server-f63a2bfd9735c59ebf97b7ce505f1d2cb154d560.tar.gz nextcloud-server-f63a2bfd9735c59ebf97b7ce505f1d2cb154d560.zip | |
Merge pull request #16083 from nextcloud/backport/15832/stable15
[stable15] 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 990bd07e59c..b7027d8d753 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1925,7 +1925,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, @@ -1966,7 +1966,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 73fc04c7cc9..8ca6185d08c 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(); } |