MDL-18351: activity block: detect when there's no course (eg admin page) and return...

diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php
index f3efc68eddc47e00546fb59bdd9c1a36ed14d28f..00f4f27ec601adcdf03dab98f979c9c4734125bc 100644 (file)
--- a/blocks/activity_modules/block_activity_modules.php
+++ b/blocks/activity_modules/block_activity_modules.php
@@ -24,6 +24,10 @@ class block_activity_modules extends block_list {
             $course = $DB->get_record('course', array('id'=>$this->instance->pageid));
         }
 
+        if (empty($course)) {
+            return '';
+        }
+
         require_once($CFG->dirroot.'/course/lib.php');
 
         $modinfo = get_fast_modinfo($course);