Fixed bug #1705.

diff --git a/mod/exercise/backuplib.php b/mod/exercise/backuplib.php
index 9e41a87ebe1c43b594a0c54d23a319c38cd8b3a2..3a97ffbca60a5941add5d0777776c3e6c4f10867 100644 (file)
--- a/mod/exercise/backuplib.php
+++ b/mod/exercise/backuplib.php
@@ -57,13 +57,13 @@
                 fwrite ($bf,full_tag("PHASE",4,false,$exercise->phase));
                 fwrite ($bf,full_tag("GRADINGSTRATEGY",4,false,$exercise->gradingstrategy));
                 fwrite ($bf,full_tag("USEMAXIMUM",4,false,$exercise->usemaximum));
+                fwrite ($bf,full_tag("ASSESSMENTCOMPS",4,false,$exercise->assessmentcomps));
                 fwrite ($bf,full_tag("ANONYMOUS",4,false,$exercise->anonymous));
                 fwrite ($bf,full_tag("MAXBYTES",4,false,$exercise->maxbytes));
                 fwrite ($bf,full_tag("DEADLINE",4,false,$exercise->deadline));
-                fwrite ($bf,full_tag("GRADE",4,false,$exercise->grade));
                 fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$exercise->timemodified));
-                fwrite ($bf,full_tag("TEACHERWEIGHT",4,false,$exercise->teacherweight));
-                fwrite ($bf,full_tag("GRADINGWEIGHT",4,false,$exercise->gradingweight));
+                fwrite ($bf,full_tag("GRADE",4,false,$exercise->grade));
+                fwrite ($bf,full_tag("GRADINGGRADE",4,false,$exercise->gradinggrade));
                 fwrite ($bf,full_tag("SHOWLEAGUETABLE",4,false,$exercise->showleaguetable));
                 //Now we backup exercise elements
                 $status = backup_exercise_elements($bf,$preferences,$exercise->id);

diff --git a/mod/exercise/restorelib.php b/mod/exercise/restorelib.php
index 1bbd4eb511e241c1b86e693b62726c1f27fb0e44..d6e45c49d8b4691e2861b09561bb024c8596330b 100644 (file)
--- a/mod/exercise/restorelib.php
+++ b/mod/exercise/restorelib.php
@@ -60,13 +60,13 @@
             $exercise->phase = backup_todb($info['MOD']['#']['PHASE']['0']['#']);
             $exercise->gradingstrategy = backup_todb($info['MOD']['#']['GRADINGSTRATEGY']['0']['#']);
             $exercise->usemaximum = backup_todb($info['MOD']['#']['USEMAXIMUM']['0']['#']);
+            $exercise->assessmentcomps = backup_todb($info['MOD']['#']['ASSESSMENTCOMPS']['0']['#']);
             $exercise->anonymous = backup_todb($info['MOD']['#']['ANONYMOUS']['0']['#']);
             $exercise->maxbytes = backup_todb($info['MOD']['#']['MAXBYTES']['0']['#']);
             $exercise->deadline = backup_todb($info['MOD']['#']['DEADLINE']['0']['#']);
-            $exercise->grade = backup_todb($info['MOD']['#']['GRADE']['0']['#']);
             $exercise->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
-            $exercise->teacherweight = backup_todb($info['MOD']['#']['TEACHERWEIGHT']['0']['#']);
-            $exercise->gradingweight = backup_todb($info['MOD']['#']['GRADINGWEIGHT']['0']['#']);
+            $exercise->grade = backup_todb($info['MOD']['#']['GRADE']['0']['#']);
+            $exercise->gradinggrade = backup_todb($info['MOD']['#']['GRADINGGRADE']['0']['#']);
             $exercise->showleaguetable = backup_todb($info['MOD']['#']['SHOWLEAGUETABLE']['0']['#']);
 
             //The structure is equal to the db, so insert the exercise