Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-26399_oracle_restore_wip' of git://github.com/stron…

…k7/moodle
  • Loading branch information...
commit d2592c9b547bfcf2e096070f9a2355c320ef6378 2 parents 15ffec3 + d84fe4c
@skodak skodak authored
Showing with 6 additions and 6 deletions.
  1. +6 −6 backup/moodle2/restore_stepslib.php
View
12 backup/moodle2/restore_stepslib.php
@@ -660,8 +660,8 @@ public function process_group($data) {
$params = array('courseid' => $this->get_courseid(), 'grname' => $data->name);
if (!empty($data->description)) {
$description_clause = ' AND ' .
- $DB->sql_compare_text('description') . ' = ' . $DB->sql_compare_text(':desc');
- $params['desc'] = $data->description;
+ $DB->sql_compare_text('description') . ' = ' . $DB->sql_compare_text(':description');
+ $params['description'] = $data->description;
}
if (!$groupdb = $DB->get_record_sql("SELECT *
FROM {groups}
@@ -708,8 +708,8 @@ public function process_grouping($data) {
$params = array('courseid' => $this->get_courseid(), 'grname' => $data->name);
if (!empty($data->description)) {
$description_clause = ' AND ' .
- $DB->sql_compare_text('description') . ' = ' . $DB->sql_compare_text(':desc');
- $params['desc'] = $data->description;
+ $DB->sql_compare_text('description') . ' = ' . $DB->sql_compare_text(':description');
+ $params['description'] = $data->description;
}
if (!$groupingdb = $DB->get_record_sql("SELECT *
FROM {groupings}
@@ -1786,7 +1786,7 @@ protected function process_grade_item($data) {
$data->timecreated = $this->apply_date_offset($data->timecreated);
$data->timemodified = $this->apply_date_offset($data->timemodified);
- $gradeitem = new grade_item($data);
+ $gradeitem = new grade_item($data, false);
$gradeitem->insert('restore');
//sortorder is automatically assigned when inserting. Re-instate the previous sortorder
@@ -1809,7 +1809,7 @@ protected function process_grade_grade($data) {
// TODO: Ask, all the rest of locktime/exported... work with time... to be rolled?
$data->overridden = $this->apply_date_offset($data->overridden);
- $grade = new grade_grade($data);
+ $grade = new grade_grade($data, false);
$grade->insert('restore');
// no need to save any grade_grade mapping
}
Please sign in to comment.
Something went wrong with that request. Please try again.