Merge branch 'MDL-77868' of https://github.com/paulholden/moodle

NoelDeMartin · Jul 3, 2023 · a3452bd · a3452bd
2 parents 71aba52 + 246e5ff
commit a3452bd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mod/bigbluebuttonbn/classes/local/config.php b/mod/bigbluebuttonbn/classes/local/config.php
@@ -121,6 +121,7 @@ protected static function defaultvalues(): array {
             'hideuserlist_default' => false,
             'hideuserlist_editable' => true,
             'welcome_default' => '',
+            'welcome_editable' => true,
             'default_dpa_accepted' => false,
             'poll_interval' => bigbluebutton_proxy::DEFAULT_POLL_INTERVAL,
             'checksum_algorithm' => self::DEFAULT_CHECKSUM_ALGORITHM,
@@ -155,7 +156,7 @@ public static function get(string $setting): string {
         if (isset($CFG->{'bigbluebuttonbn_' . $setting})) {
             return (string) $CFG->{'bigbluebuttonbn_' . $setting};
         }
-        return self::defaultvalue($setting);
+        return (string) self::defaultvalue($setting);
     }
 
     /**