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

2023-07-03 17:29:40 +02:00
parent 7cf23d5396 38e53fdcb6
commit b90771ef97
1 changed files with 2 additions and 1 deletions
@@ -110,6 +110,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,
        ];
@@ -143,7 +144,7 @@ class config {
        if (isset($CFG->{'bigbluebuttonbn_' . $setting})) {
            return (string) $CFG->{'bigbluebuttonbn_' . $setting};
        }
-        return self::defaultvalue($setting);
+        return (string) self::defaultvalue($setting);
    }

    /**