Merge remote-tracking branch 'origin/CCLE-9671-waiting-room-jbh-error'

ncstate-delta · Mar 10, 2021 · 6ed14e4 · 6ed14e4
2 parents ca96dbd + 3cd6500
commit 6ed14e4
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/mod_form.php b/mod_form.php
@@ -292,15 +292,13 @@ public function definition() {
         $mform->addHelpButton('option_waiting_room', 'option_waiting_room', 'zoom');
         $mform->setDefault('option_waiting_room', $config->defaultwaitingroomoption);
         $mform->disabledIf('option_waiting_room', 'webinar', 'checked');
-        $mform->disabledIf('option_waiting_room', 'option_jbh', 'checked');
 
         // Add join before host widget.
         $mform->addElement('advcheckbox', 'option_jbh', get_string('option_jbh', 'zoom'),
                 get_string('joinbeforehostenable', 'zoom'));
         $mform->setDefault('option_jbh', $config->defaultjoinbeforehost);
         $mform->addHelpButton('option_jbh', 'option_jbh', 'zoom');
         $mform->disabledIf('option_jbh', 'webinar', 'checked');
-        $mform->disabledIf('option_jbh', 'option_waiting_room', 'checked');
 
         // Add authenticated users widget.
         $mform->addElement('advcheckbox', 'option_authenticated_users', get_string('authentication', 'zoom'),