Merge branch 'MDL-36130' of git://github.com/aolley/moodle

wakamori · Oct 31, 2012 · 9b18e58 · 9b18e58
2 parents cedf976 + ac9ac1f
commit 9b18e58
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/mod/assign/upgradelib.php b/mod/assign/upgradelib.php
@@ -171,6 +171,11 @@ public function upgrade_assignment($oldassignmentid, & $log) {
             }
             $completiondone = true;
 
+            // Migrate log entries so we don't lose them.
+            $logparams = array('cmid' => $oldcoursemodule->id, 'course' => $oldcoursemodule->course);
+            $DB->set_field('log', 'module', 'assign', $logparams);
+            $DB->set_field('log', 'cmid', $newcoursemodule->id, $logparams);
+
 
             // copy all the submission data (and get plugins to do their bit)
             $oldsubmissions = $DB->get_records('assignment_submissions', array('assignment'=>$oldassignmentid));
@@ -269,6 +274,10 @@ public function upgrade_assignment($oldassignmentid, & $log) {
                     $DB->update_record('course_completion_criteria', $criteria);
                 }
             }
+            // Roll back the log changes
+            $logparams = array('cmid' => $newcoursemodule->id, 'course' => $newcoursemodule->course);
+            $DB->set_field('log', 'module', 'assignment', $logparams);
+            $DB->set_field('log', 'cmid', $oldcoursemodule->id, $logparams);
             // roll back the advanced grading update
             if ($gradingarea) {
                 foreach ($gradeidmap as $newgradeid => $oldsubmissionid) {