Merge pull request #15832 from nextcloud/bugfix/noid/fulltext-search-…

…groupfolders Fix full text search for groupfolders
nextcloud · Jun 25, 2019 · 2f5810f · 2f5810f
2 parents 0f0dfc8 + 9dac971
commit 2f5810f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -1933,7 +1933,7 @@ private function lockPath($path, $type, $lockMountPoint = false) {
 		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 @@ public function changeLock($path, $type, $lockMountPoint = false) {
 		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
@@ -1430,6 +1430,9 @@ public function getAccessList(\OCP\Files\Node $path, $recursive = true, $current
 		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();
 		}