MDL-10226 fixed breakage in grade computing

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index 36869df2e31e45be0a10619cbf76e8336c70672d..97173fa556e84318d1deb69a50f5844f4f9542d3 100644 (file)
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -819,7 +819,7 @@ class grade_category extends grade_object {
         $this->depth           = null;       // remove old path and depth - will be recalculated in update()
         $this->update($source);
 
-        return $grade_item->update($source);
+        return $this->update($source);
     }
 
     /**

diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index 802781b4b61e4798dba048e8aa43f2e3b6c5a8ef..9a30c74486acb7b236bbc53be2d286f81f7d9db8 100644 (file)
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -1255,16 +1255,13 @@ class grade_item extends grade_object {
             $grade->grade_item =& $this;
 
         } else {
-            $grade = new grade_grades(array('itemid'=>$this->id, 'userid'=>$userid, 'rawgrademin'=>null, 'rawgrademax'=>null, 'rawscaledi'=>null), false);
+            $grade = new grade_grades(array('itemid'=>$this->id, 'userid'=>$userid), false);
             $grade->insert('system');
             $grade->grade_item =& $this;
 
             $oldgrade = new object();
             $oldgrade->finalgrade  = $grade->finalgrade;
             $oldgrade->rawgrade    = $grade->rawgrade;
-            $oldgrade->rawgrademin = $grade->rawgrademin;
-            $oldgrade->rawgrademax = $grade->rawgrademax;
-            $oldgrade->rawscaleid  = $grade->rawscaleid;
         }
 
         // no need to recalculate locked grades
@@ -1277,9 +1274,6 @@ class grade_item extends grade_object {
         $result = $this->formula->evaluate();
 
         // no raw grade for calculated grades - only final
-        $grade->rawgrademin = null;
-        $grade->rawgrademax = null;
-        $grade->rawscaleid  = null;
         $grade->rawgrade    = null;
 
 
@@ -1297,10 +1291,7 @@ class grade_item extends grade_object {
 
         // update in db if changed
         if (   $grade->finalgrade  !== $oldgrade->finalgrade
-            or $grade->rawgrade    !== $oldgrade->rawgrade
-            or $grade->rawgrademin !== $oldgrade->rawgrademin
-            or $grade->rawgrademax !== $oldgrade->rawgrademax
-            or $grade->rawscaleid  !== $oldgrade->rawscaleid) {
+            or $grade->rawgrade    !== $oldgrade->rawgrade) {
 
             $grade->update('system');
         }