Merge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle

This commit is contained in:
Dan Poltawski
2013-10-24 16:07:17 +08:00
+3 -1
View File
@@ -882,9 +882,11 @@ abstract class restore_dbops {
$newcontextid = $forcenewcontextid;
} else {
// Get new context, must exist or this will fail
if (!$newcontextid = self::get_backup_ids_record($restoreid, 'context', $oldcontextid)->newitemid) {
$newcontextrecord = self::get_backup_ids_record($restoreid, 'context', $oldcontextid);
if (!$newcontextrecord || !$newcontextrecord->newitemid) {
throw new restore_dbops_exception('unknown_context_mapping', $oldcontextid);
}
$newcontextid = $newcontextrecord->newitemid;
}
// Sometimes it's possible to have not the oldcontextids stored into backup_ids_temp->parentitemid