mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16082 from nextcloud/backport/15832/stable16 

[stable16] Fix full text search for groupfolders
This commit is contained in:
Roeland Jago Douma 2019-06-26 15:49:12 +02:00 committed by GitHub
parent c09c530529 8c1ce34a03
commit 33663ff04e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Files/View.php
View File

@ -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,

3
lib/private/Share20/Manager.php
View File

@ -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();
}