From 6e763244ed799bb4eb4fc4f049429f9b99b90f86 Mon Sep 17 00:00:00 2001 From: Mark Nielsen Date: Mon, 15 Oct 2012 17:18:34 +0800 Subject: [PATCH] MDL-34837 backup: Restore does not fail when some courses have the same name --- backup/util/dbops/restore_dbops.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backup/util/dbops/restore_dbops.class.php b/backup/util/dbops/restore_dbops.class.php index fb7beb34dca5a..e856ead712c9c 100644 --- a/backup/util/dbops/restore_dbops.class.php +++ b/backup/util/dbops/restore_dbops.class.php @@ -1505,7 +1505,8 @@ public static function calculate_course_names($courseid, $fullname, $shortname) } $currentfullname = $fullname.$suffixfull; $currentshortname = substr($shortname, 0, 100 - strlen($suffixshort)).$suffixshort; // < 100cc - $coursefull = $DB->get_record_select('course', 'fullname = ? AND id != ?', array($currentfullname, $courseid)); + $coursefull = $DB->get_record_select('course', 'fullname = ? AND id != ?', + array($currentfullname, $courseid), '*', IGNORE_MULTIPLE); $courseshort = $DB->get_record_select('course', 'shortname = ? AND id != ?', array($currentshortname, $courseid)); $counter++; } while ($coursefull || $courseshort);