From 3fe7186e319233dac0f32ab09b60adce5ad3b4aa Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 2 Nov 2016 16:19:46 +0100 Subject: [PATCH] First process group shares and then user shares This prevents a validation failure where the code checks whether a file is already shared with another user, but the check disables itself when the owner is the same. Processing the groups first prevents the check to kick in too early when the group share still has the old owner while we try transferring the user share. --- apps/files/lib/Command/TransferOwnership.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php index 3b51e4a9e6..c8366be32c 100644 --- a/apps/files/lib/Command/TransferOwnership.php +++ b/apps/files/lib/Command/TransferOwnership.php @@ -188,7 +188,7 @@ class TransferOwnership extends Command { $output->writeln("Collecting all share information for files and folder of $this->sourceUser ..."); $progress = new ProgressBar($output, count($this->shares)); - foreach([\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE] as $shareType) { + foreach([\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE] as $shareType) { $offset = 0; while (true) { $sharePage = $this->shareManager->getSharesBy($this->sourceUser, $shareType, null, true, 50, $offset);