Don't bother working with empty course modules (can happen when an

module is uninstalled improperly)

diff --git a/course/lib.php b/course/lib.php
index 403aacac54a9d2b2f63d9e2a778d12c79c86b34f..48295e186fb72900d4141f99ae612ca93671b9e8 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -422,6 +422,9 @@ function get_array_of_activities($courseid) {
            if ($section->sequence) {
                $sequence = explode(",", $section->sequence);
                foreach ($sequence as $seq) {
+                   if (empty($rawmods[$seq])) {
+                       continue;
+                   }
                    $mod[$seq]->cm = $rawmods[$seq]->id;
                    $mod[$seq]->mod = $rawmods[$seq]->modname;
                    $mod[$seq]->section = $section->section;

diff --git a/course/user.php b/course/user.php
index 7171f7198cfa61b8ff76b4e1f6be559af87b95a4..62b5db3aed065fec169ca8c0584f352f8d78f5d9 100644 (file)
--- a/course/user.php
+++ b/course/user.php
@@ -107,6 +107,9 @@
 
                         $sectionmods = explode(",", $section->sequence);
                         foreach ($sectionmods as $sectionmod) {
+                            if (empty($mods[$sectionmod])) {
+                                continue;
+                            }
                             $mod = $mods[$sectionmod];
                             $instance = get_record("$mod->modname", "id", "$mod->instance");
                             $libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";