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

2023-07-03 17:29:35 +02:00
parent 576ae57607 6f97a0325c
commit 28005f7f39
1 changed files with 2 additions and 1 deletions
@@ -121,6 +121,7 @@ class config {
            '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 @@ class config {
        if (isset($CFG->{'bigbluebuttonbn_' . $setting})) {
            return (string) $CFG->{'bigbluebuttonbn_' . $setting};
        }
-        return self::defaultvalue($setting);
+        return (string) self::defaultvalue($setting);
    }

    /**