Added failsafe code in case config files haven't been updated.

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 34ac53986afa7ea481776c20390a801477acc602..879e744962e3b0a12f4b26539aab24bb00ce9a04 100644 (file)
--- 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';
+        }
     }
 }