Merge pull request #10939 from nextcloud/bugfix/10930/perm-checker-wr…

…ong-path Fix path when app has wrong permission
nextcloud · Aug 30, 2018 · 1ddde36 · 1ddde36
2 parents 8ea2f8d + a6bb19f
commit 1ddde36
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
@@ -544,18 +544,17 @@ protected function hasOpcacheLoaded(): bool {
 	 */
 	protected function getAppDirsWithDifferentOwner(): array {
 		$currentUser = posix_getpwuid(posix_getuid());
-		$appDirsWithDifferentOwner = [];
+		$appDirsWithDifferentOwner = [[]];
 
 		foreach (OC::$APPSROOTS as $appRoot) {
 			if ($appRoot['writable'] === true) {
-				$appDirsWithDifferentOwner = array_merge(
-					$appDirsWithDifferentOwner,
-					$this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot)
-				);
+				$appDirsWithDifferentOwner[] = $this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot);
 			}
 		}
 
+		$appDirsWithDifferentOwner = array_merge(...$appDirsWithDifferentOwner);
 		sort($appDirsWithDifferentOwner);
+
 		return $appDirsWithDifferentOwner;
 	}
 
@@ -576,7 +575,7 @@ private function getAppDirsWithDifferentOwnerForAppRoot(array $currentUser, arra
 				$absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
 				$appDirUser = posix_getpwuid(fileowner($absAppPath));
 				if ($appDirUser !== $currentUser) {
-					$appDirsWithDifferentOwner[] = $absAppPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
+					$appDirsWithDifferentOwner[] = $absAppPath;
 				}
 			}
 		}