moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-45851_35' of git://github.com/timhunt/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Andrew Nicols 2018-07-16 13:18:16 +08:00
commit 474ec7e94b
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backup/util/dbops/restore_dbops.class.php
View file

@ -604,7 +604,8 @@ abstract class restore_dbops {
// 6b) User cannot, check if we are in some contextlevel with fallback // 6b) User cannot, check if we are in some contextlevel with fallback
// 7a) There is fallback, move ALL the qcats to fallback, warn. End qcat loop // 7a) There is fallback, move ALL the qcats to fallback, warn. End qcat loop
// 7b) No fallback, error. End qcat loop // 7b) No fallback, error. End qcat loop
// 5b) Match, mark q to be mapped // 5b) Random question, must always create new.
// 5c) Match, mark q to be mapped
// 8) Check if backup is from Moodle >= 3.5 and error if more than one top-level category in the context. // 8) Check if backup is from Moodle >= 3.5 and error if more than one top-level category in the context.
// Get all the contexts (question banks) in restore for the given contextlevel // Get all the contexts (question banks) in restore for the given contextlevel
@ -708,7 +709,11 @@ abstract class restore_dbops {
break 2; // out from qcat loop (both 7a and 7b), we have decided about ALL categories in context (bank) break 2; // out from qcat loop (both 7a and 7b), we have decided about ALL categories in context (bank)
} }
// 5b) Match, mark q to be mapped // 5b) Random questions must always be newly created.
} else if ($question->qtype == 'random') {
// Nothing to mark, newitemid means create
// 5c) Match, mark q to be mapped.
} else { } else {
self::set_backup_ids_record($restoreid, 'question', $question->id, $matchqid); self::set_backup_ids_record($restoreid, 'question', $question->id, $matchqid);
} }