Merge branch 'master_MDL-44548' of git://github.com/danmarsden/moodle

This commit is contained in:
David Monllao 2015-03-16 10:04:14 +08:00
commit 5f2747c866

View File

@ -850,7 +850,7 @@ function scorm_get_all_attempts($scormid, $userid) {
function scorm_view_display ($user, $scorm, $action, $cm) { function scorm_view_display ($user, $scorm, $action, $cm) {
global $CFG, $DB, $PAGE, $OUTPUT, $COURSE; global $CFG, $DB, $PAGE, $OUTPUT, $COURSE;
if ($scorm->scormtype != SCORM_TYPE_LOCAL && $scorm->updatefreq == SCORM_UPDATE_EVERYTIME) { if ($scorm->updatefreq == SCORM_UPDATE_EVERYTIME) {
scorm_parse($scorm, false); scorm_parse($scorm, false);
} }
@ -952,7 +952,7 @@ function scorm_simple_play($scorm, $user, $context, $cmid) {
return $result; return $result;
} }
if ($scorm->scormtype != SCORM_TYPE_LOCAL && $scorm->updatefreq == SCORM_UPDATE_EVERYTIME) { if ($scorm->updatefreq == SCORM_UPDATE_EVERYTIME) {
scorm_parse($scorm, false); scorm_parse($scorm, false);
} }
$scoes = $DB->get_records_select('scorm_scoes', 'scorm = ? AND '. $scoes = $DB->get_records_select('scorm_scoes', 'scorm = ? AND '.