Merge 093e286e0f into d023ffa331

Merge pull request #310 from arawa/fix/309_group_displayname_is_null
fix: #309 group displayname might be null
2024-12-05 10:07:01 +01:00 · 2024-12-05 10:06:49 +01:00 · 2024-12-05 09:59:22 +01:00 · 2024-06-02 18:16:54 +02:00
2 changed files with 4 additions and 3 deletions
--- a/lib/BigBlueButton/API.php
+++ b/lib/BigBlueButton/API.php
@ -118,7 +118,8 @@ class API {
 		$joinMeetingParams->addUserData('bbb_skip_video_preview_on_first_join', !$room->getMediaCheck()); // 2.3

 		if ($room->getCleanLayout()) {
-			$joinMeetingParams->addUserData('bbb_auto_swap_layout', true);
+			$joinMeetingParams->addUserData('bbb_auto_swap_layout', true); // 2.5 and below // ToDo: remove in the future
+			$joinMeetingParams->addUserData('bbb_hide_presentation_on_join', true); // 2.6 and up
 			$joinMeetingParams->addUserData('bbb_show_participants_on_login', false);
 			$joinMeetingParams->addUserData('bbb_show_public_chat_on_login', false);
 		}
--- a/lib/Db/Restriction.php
+++ b/lib/Db/Restriction.php
@ -34,8 +34,8 @@ class Restriction extends Entity implements JsonSerializable {
 		$this->addType('allowRecording', 'boolean');
 	}

-	public function setGroupName(string $groupName) {
-		$this->groupName = $groupName;
+	public function setGroupName(?string $groupName) {
+		$this->groupName = $groupName ?? '';
 	}

 	public function jsonSerialize(): array {
Author	SHA1	Message	Date
Jonas	9f4e7bbf44	Merge `093e286e0f` into `d023ffa331`	2024-12-05 10:07:01 +01:00
Thibaut	d023ffa331	Merge pull request #310 from arawa/fix/309_group_displayname_is_null fix: #309 group displayname might be null	2024-12-05 10:06:49 +01:00
Sebastien Marinier	834e2a7800	fix: #309 group displayname might be null	2024-12-05 09:59:22 +01:00
brtbr	093e286e0f	fix: add new hide_presentation_on_join flag As of BBB 2.6 the userdata flag for hiding the presentation has changed. This commit adds the new `bbb_hide_presentation_on_join` flag when a clean layout is selected. In order to keep backwards compatability for BBB 2.5 and lower we can send both flags and remove the deprecated one later on.	2024-06-02 18:16:54 +02:00