From: mjollnir_ <mjollnir_>
Date: Mon, 23 Feb 2009 14:49:05 +0000 (+0000)
Subject: MDL-18351: activity block: detect when there's no course (eg admin page) and return... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2a42e8954fcb00f5a71c402dd0c0a8351d539051;p=moodle.git

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

diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php
index f3efc68edd..00f4f27ec6 100644
--- 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);