From e24b125a3a0d164ad15fc2aadfc0c9c3fd398c29 Mon Sep 17 00:00:00 2001
From: Tim Lock <tim@netspot.com.au>
Date: Mon, 20 Aug 2012 14:33:01 +0800
Subject: [PATCH] MDL-31623 Course: Course reset bypass modules, which are
 removed

---
 course/reset_form.php | 6 +++---
 lib/moodlelib.php     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/course/reset_form.php b/course/reset_form.php
index 09fb15b172d..b4a86fe159f 100644
--- a/course/reset_form.php
+++ b/course/reset_form.php
@@ -61,13 +61,13 @@ class course_reset_form extends moodleform {
         if ($allmods = $DB->get_records('modules') ) {
             foreach ($allmods as $mod) {
                 $modname = $mod->name;
-                if (!$DB->count_records($modname, array('course'=>$COURSE->id))) {
-                    continue; // skip mods with no instances
-                }
                 $modfile = $CFG->dirroot."/mod/$modname/lib.php";
                 $mod_reset_course_form_definition = $modname.'_reset_course_form_definition';
                 $mod_reset__userdata = $modname.'_reset_userdata';
                 if (file_exists($modfile)) {
+                    if (!$DB->count_records($modname, array('course'=>$COURSE->id))) {
+                        continue; // Skip mods with no instances
+                    }
                     include_once($modfile);
                     if (function_exists($mod_reset_course_form_definition)) {
                         $mod_reset_course_form_definition($mform);
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 55cf4e8f840..58a6c59e4db 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4961,12 +4961,12 @@ function reset_course_userdata($data) {
     if ($allmods = $DB->get_records('modules') ) {
         foreach ($allmods as $mod) {
             $modname = $mod->name;
-            if (!$DB->count_records($modname, array('course'=>$data->courseid))) {
-                continue; // skip mods with no instances
-            }
             $modfile = $CFG->dirroot.'/mod/'. $modname.'/lib.php';
             $moddeleteuserdata = $modname.'_reset_userdata';   // Function to delete user data
             if (file_exists($modfile)) {
+                if (!$DB->count_records($modname, array('course'=>$data->courseid))) {
+                    continue; // Skip mods with no instances
+                }
                 include_once($modfile);
                 if (function_exists($moddeleteuserdata)) {
                     $modstatus = $moddeleteuserdata($data);