Merge remote-tracking branch 'origin/stable15' into stable15

nextcloud · Feb 2, 2019 · 0b3f57f · 0b3f57f
2 parents feb9735 + 3da906f
commit 0b3f57f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Service/FilesService.php b/lib/Service/FilesService.php
@@ -214,6 +214,10 @@ private function initFileSystems(string $userId) {
 			return;
 		}
 
+		if ($this->userManager->get($userId) === null) {
+			return;
+		}
+
 		$this->externalFilesService->initExternalFilesForUser($userId);
 		$this->groupFoldersService->initGroupSharesForUser($userId);
 	}

diff --git a/lib/Service/LocalFilesService.php b/lib/Service/LocalFilesService.php
@@ -109,8 +109,8 @@ public function __construct(
 	 * @throws KnownFileSourceException
 	 */
 	public function getFileSource(Node $file, string &$source) {
-		if ($file->getMountPoint()
-				 ->getMountType() !== '') {
+		$mountType = $file->getMountPoint()->getMountType();
+		if ($mountType !== '' && $mountType !== 'shared') {
 			return;
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -214,6 +214,10 @@ private function initFileSystems(string $userId) { @@
     			return;
     		}
+    		if ($this->userManager->get($userId) === null) {
+    			return;
+    		}
     		$this->externalFilesService->initExternalFilesForUser($userId);
     		$this->groupFoldersService->initGroupSharesForUser($userId);
     	}
@@ Expand Down @@