From 246e5ff95c54c14d183ccb5cb1c74ef4643efec0 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Wed, 7 Jun 2023 00:10:09 +0100 Subject: [PATCH] MDL-77868 mod_bigbluebuttonbn: default config for welcome editable. The property was added to the config options in c3f4123b, however no default value was provided, meaning if it was ever unset then a PHP type error would be triggered on the null return. --- mod/bigbluebuttonbn/classes/local/config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/bigbluebuttonbn/classes/local/config.php b/mod/bigbluebuttonbn/classes/local/config.php index 2a9047b0480..15bcea31c8a 100644 --- a/mod/bigbluebuttonbn/classes/local/config.php +++ b/mod/bigbluebuttonbn/classes/local/config.php @@ -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); } /**