Merge branch 'm26_MDL-46639' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

This commit is contained in:
Marina Glancy 2014-09-03 16:59:38 +08:00
commit 6e4c10f987

View file

@ -291,7 +291,6 @@ function scorm_parse($scorm, $full) {
$scorm->version = 'ERROR';
} else {
$scorm->version = 'AICC';
$scorm->launch = $result;
}
}
@ -311,7 +310,6 @@ function scorm_parse($scorm, $full) {
$scorm->version = 'ERROR';
} else {
$scorm->version = 'AICC';
$scorm->launch = $result;
}
} else {