MDL-29479 It is now possible to set the active method to null (simple…

… direct grading)
moodle · Oct 5, 2011 · 8cd65f1 · 8cd65f1
1 parent fb13a14
commit 8cd65f1
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/grade/grading/lib.php b/grade/grading/lib.php
@@ -223,13 +223,17 @@ public function set_active_method($method) {
 
         $this->ensure_isset(array('context', 'component', 'area'));
 
-        // make sure the passed method is a valid plugin name
-        if ('gradingform_'.$method !== clean_param('gradingform_'.$method, PARAM_COMPONENT)) {
-            throw new moodle_exception('invalid_method_name', 'core_grading');
-        }
-        $available = $this->get_available_methods(false);
-        if (!array_key_exists($method, $available)) {
-            throw new moodle_exception('invalid_method_name', 'core_grading');
+        // make sure the passed method is empty or a valid plugin name
+        if (empty($method)) {
+            $method = null;
+        } else {
+            if ('gradingform_'.$method !== clean_param('gradingform_'.$method, PARAM_COMPONENT)) {
+                throw new moodle_exception('invalid_method_name', 'core_grading');
+            }
+            $available = $this->get_available_methods(false);
+            if (!array_key_exists($method, $available)) {
+                throw new moodle_exception('invalid_method_name', 'core_grading');
+            }
         }
 
         // get the current grading area record if it exists
@@ -252,7 +256,7 @@ public function set_active_method($method) {
 
         } else {
             // update the existing record if needed
-            if ($this->areacache->activemethod != $method) {
+            if ($this->areacache->activemethod !== $method) {
                 $DB->set_field('grading_areas', 'activemethod', $method, array('id' => $this->areacache->id));
             }
         }