MDL-33537 gradingform_rubric Adding the definition when retrieving gr…

…ading instances Credit to Sam Chaffee
moodle · Jul 20, 2012 · e0cf9e2 · e0cf9e2
1 parent 9592f5d
commit e0cf9e2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/grade/grading/form/rubric/lib.php b/grade/grading/form/rubric/lib.php
@@ -556,7 +556,8 @@ public function get_or_create_instance($instanceid, $raterid, $itemid) {
             return $this->get_instance($instance);
         }
         if ($itemid && $raterid) {
-            if ($rs = $DB->get_records('grading_instances', array('raterid' => $raterid, 'itemid' => $itemid), 'timemodified DESC', '*', 0, 1)) {
+            $params = array('definitionid' => $this->definition->id, 'raterid' => $raterid, 'itemid' => $itemid);
+            if ($rs = $DB->get_records('grading_instances', $params, 'timemodified DESC', '*', 0, 1)) {
                 $record = reset($rs);
                 $currentinstance = $this->get_current_instance($raterid, $itemid);
                 if ($record->status == gradingform_rubric_instance::INSTANCE_STATUS_INCOMPLETE &&