Merge pull request #16082 from nextcloud/backport/15832/stable16
[stable16] Fix full text search for groupfolders
This commit is contained in:
commit
33663ff04e
|
@ -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,
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue