MDL-21191 Fixing another regression in dependency calculation

This is not easy to spot as $params may just contain one more item than $sql would expect. However, $sql and $params should be well paired.
UniGe · Dec 25, 2009 · f5a726f · f5a726f
1 parent 84d6e83
commit f5a726f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
@@ -1343,8 +1343,12 @@ public function depends_on($reset_cache=false) {
             } else {
                 $params[] = $grade_category->id;
                 $params[] = $grade_category->id;
-                $params[] = GRADE_TYPE_VALUE;
-                $params[] = GRADE_TYPE_SCALE;
+                if (empty($CFG->grade_includescalesinaggregation)) {
+                    $params[] = GRADE_TYPE_VALUE;
+                } else {
+                    $params[] = GRADE_TYPE_VALUE;
+                    $params[] = GRADE_TYPE_SCALE;
+                }
                 $sql = "SELECT gi.id
                           FROM {grade_items} gi
                          WHERE $gtypes