MDL-51715 lib/grade: Zero out aggregationweight for novalue and dropped

set_usedinaggregation was setting aggregationweight to zero in these cases for non-category grades, but not for category grades.
moodle · Nov 2, 2015 · f2f35e8 · f2f35e8
1 parent fb29022
commit f2f35e8
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
@@ -838,11 +838,12 @@ private function set_usedinaggregation($userid, $usedweights, $novalue, $dropped
 
             $itemlist['userid'] = $userid;
 
-            $DB->set_field_select('grade_grades',
-                                  'aggregationstatus',
-                                  'novalue',
-                                  "itemid $itemsql AND userid = :userid",
-                                  $itemlist);
+            $sql = "UPDATE {grade_grades}
+                       SET aggregationstatus = 'novalue',
+                           aggregationweight = 0
+                     WHERE itemid $itemsql AND userid = :userid";
+
+            $DB->execute($sql, $itemlist);
         }
 
         // Dropped.
@@ -851,11 +852,12 @@ private function set_usedinaggregation($userid, $usedweights, $novalue, $dropped
 
             $itemlist['userid'] = $userid;
 
-            $DB->set_field_select('grade_grades',
-                                  'aggregationstatus',
-                                  'dropped',
-                                  "itemid $itemsql AND userid = :userid",
-                                  $itemlist);
+            $sql = "UPDATE {grade_grades}
+                       SET aggregationstatus = 'dropped',
+                           aggregationweight = 0
+                     WHERE itemid $itemsql AND userid = :userid";
+
+            $DB->execute($sql, $itemlist);
         }
 
         // Extra credit.