Merge pull request #939 from nextcloud/backport/936/stable22

[stable22] set member as INVITED only if not external
nextcloud · Feb 24, 2022 · eb9cf95 · eb9cf95
2 parents 2ac2a0c + 7b6768b
commit eb9cf95
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/FederatedItems/SingleMemberAdd.php b/lib/FederatedItems/SingleMemberAdd.php
@@ -411,7 +411,9 @@ private function manageMemberStatus(Circle $circle, Member $member) {
 		} catch (MemberNotFoundException $e) {
 			$member->setId($this->token(ManagedModel::ID_LENGTH));
 
-			if ($circle->isConfig(Circle::CFG_INVITE)) {
+			if ($circle->isConfig(Circle::CFG_INVITE)
+				&& $member->getUserType() !== Member::TYPE_MAIL
+				&& $member->getUserType() !== Member::TYPE_CONTACT) {
 				$member->setStatus(Member::STATUS_INVITED);
 			} else {
 				$member->setLevel(Member::LEVEL_MEMBER);