From 658724df8f2c7401ecbf07297f04ef966a818887 Mon Sep 17 00:00:00 2001 From: mchurch Date: Fri, 3 Sep 2004 20:19:16 +0000 Subject: [PATCH] Added failsafe code in case config files haven't been updated. --- lib/blocklib.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/blocklib.php b/lib/blocklib.php index 34ac53986a..879e744962 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -931,8 +931,9 @@ function blocks_get_config_default ($cformat='') { if (!empty($CFG->defaultblocks_site)) { return $CFG->defaultblocks_site; } + /// Failsafe - in case nothing was defined. else { - return $CFG->defaultblocks; + return 'site_main_menu,admin,course_list:course_summary,calendar_month'; } } /// Return the appropriate block string for the format. @@ -947,9 +948,13 @@ function blocks_get_config_default ($cformat='') { if (!empty($format['defaultblocks'])) { return $format['defaultblocks']; } - else { + else if (!empty($CFG->defaultblocks)){ return $CFG->defaultblocks; } + /// Failsafe - in case nothing was defined. + else { + return 'participants,activity_modules,search_forums,admin,course_list:news_items,calendar_upcoming,recent_activity'; + } } } -- 2.39.5