From b2af9c58950aa7951f092266c0876eba7c22f298 Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Tue, 31 Jul 2007 09:04:36 +0000
Subject: [PATCH] some more fix on grade outcome scaleid, should be working now
---
backup/restorelib.php | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/backup/restorelib.php b/backup/restorelib.php
index bee9b2c8eb..5f441f92ed 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1357,23 +1357,24 @@
if ($info['GRADE_OUTCOME']['#']['SCALEID']['0']['#']) {
$scale = backup_getid($restore->backup_unique_code,"scale",backup_todb($info['GRADE_OUTCOME']['#']['SCALEID']['0']['#']));
- $derec->scaleid = $scale->new_id;
+ $dbrec->scaleid = $scale->new_id;
}
$modifier = backup_getid($restore->backup_unique_code,"user", backup_todb($info['GRADE_OUTCOME']['#']['USERMODIFIED']['0']['#']));
- $derec->usermodified = $modifier->new_id;
+ $dbrec->usermodified = $modifier->new_id;
// Structure is equal to db, insert record
- // If the shortname doesn't exist
-
+ // If the shortname doesn't exist
- if (!empty($dbrec->courseid)) {
- $course_to_search = 0;
+ if (empty($info['GRADE_OUTCOME']['#']['COURSEID']['0']['#'])) {
+ $prerec = get_record_sql("SELECT * FROM {$CFG->prefix}grade_outcomes
+ WHERE courseid IS NULL
+ AND shortname = '$dbrec->shortname'");
} else {
- $course_to_search = $restore->course_id;
+ $prerec = get_record('grade_outcomes','courseid',$restore->course_id,'shortname',$dbrec->shortname);
}
- if (!$prerec = get_record('grade_outcomes','courseid',$course_to_search,'shortname',$dbrec->shortname)) {
+ if (!$prerec) {
$newid = insert_record('grade_outcomes',$dbrec);
} else {
$newid = $prerec->id;
--
2.39.5