Merge pull request #14227 from nextcloud/backport/14209/stable31

Antreesy · web-flow · commit e377ef5ac005 · 2025-01-27T11:20:13.000+01:00
diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php
@@ -169,7 +169,7 @@ public function createConversation(int $type, string $name, ?IUser $owner = null
 			throw new PasswordException(PasswordException::REASON_VALUE, $this->l10n->t('Password needs to be set'));
 		}
 
-		if ($type !== Room::TYPE_PUBLIC) {
+		if ($type !== Room::TYPE_PUBLIC || $password === '') {
 			$room = $this->manager->createRoom($type, $name, $objectType, $objectId);
 		} else {
 			$event = new ValidatePasswordPolicyEvent($password);

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public function createConversation(int $type, string $name, ?IUser $owner = null`
`169`	`169`	`throw new PasswordException(PasswordException::REASON_VALUE, $this->l10n->t('Password needs to be set'));`
`170`	`170`	`}`
`171`	`171`
`172`		`- if ($type !== Room::TYPE_PUBLIC) {`
	`172`	`+ if ($type !== Room::TYPE_PUBLIC \|\| $password === '') {`
`173`	`173`	`$room = $this->manager->createRoom($type, $name, $objectType, $objectId);`
`174`	`174`	`} else {`
`175`	`175`	`$event = new ValidatePasswordPolicyEvent($password);`