Calculate NEXT course->sortorder in restore to avoid

sortorder grown always (by fix_course_sortorder()).

Merged from MOODLE_14_STABLE

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 8cbb281a7d25e48fe3a610cc993c36a2e25c1cc2..2b6288764955ebefe26281b162a8f01dfa243961 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -551,6 +551,16 @@
             $course->hiddensections = addslashes($course_header->course_hiddensections);
             $course->timecreated = addslashes($course_header->course_timecreated);
             $course->timemodified = addslashes($course_header->course_timemodified);
+            //Calculate sortorder field
+            $sortmax = get_record_sql('SELECT MAX(sortorder) AS max
+                                       FROM ' . $CFG->prefix . 'course
+                                       WHERE category=' . $course->category);
+            if (!empty($sortmax->max)) {
+                $course->sortorder = $sortmax->max + 1;
+                unset($sortmax);
+            } else {
+                $course->sortorder = 100;
+            }
             //Now insert the record
             $newid = insert_record("course",$course);
             if ($newid) {