Permalink
Browse files

Merge branch 'MDL-34837-23' of git://github.com/FMCorz/moodle into MO…

…ODLE_23_STABLE
  • Loading branch information...
danpoltawski committed Oct 29, 2012
2 parents ff20352 + 6e76324 commit 418a22905c90b9c684754d2899db94799c2d0747
Showing with 2 additions and 1 deletion.
  1. +2 −1 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);

0 comments on commit 418a229

Please sign in to comment.