Merge pull request #20844 from owncloud/files-scan-user-path-80

[8.0] Lock scanner to the given user

1 files changed, 5 insertions, 4 deletions

diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php
index 87f799a0187..9a453f16fe5 100644
--- a/apps/files/command/scan.php
+++ b/apps/files/command/scan.php
@@ -76,10 +76,10 @@ class Scan extends Command {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getOption('path');
-		if ($path) {
-			$path = '/'.trim($path, '/');
-			list (, $user, ) = explode('/', $path, 3);
+		$inputPath = $input->getOption('path');
+		if ($inputPath) {
+			$inputPath = '/' . trim($inputPath, '/');
+			list (, $user,) = explode('/', $inputPath, 3);
 			$users = array($user);
 		} else if ($input->getOption('all')) {
 			$users = $this->userManager->search('');
@@ -98,6 +98,7 @@ class Scan extends Command {
 			if (is_object($user)) {
 				$user = $user->getUID();
 			}
+			$path = $inputPath ? $inputPath : '/' . $user;
 			if ($this->userManager->userExists($user)) {
 				$this->scanFiles($user, $path, $quiet, $output);
 			} else {