Merge branch 'master_MDL-46408' of https://github.com/danmarsden/moodle

This commit is contained in:
Andrew Nicols 2015-02-24 11:34:27 +08:00
commit ad80b121ad

View File

@ -589,7 +589,9 @@ function scorm_parse_scorm(&$scorm, $manifest) {
}
}
if (!empty($defaultorgid) && empty($firstinorg) && $newitem->parent == $scoes->defaultorg) {
if (!empty($defaultorgid) && !empty($scoes->defaultorg) && empty($firstinorg) &&
$newitem->parent == $scoes->defaultorg) {
$firstinorg = $sortorder;
}