MDL-36421 SCORM: fix SCORM course format new window popups

This commit is contained in:
Ben Johnson 2013-01-15 21:42:56 +13:00 committed by Dan Marsden
parent ca48fe5f97
commit 7536464d61

View File

@ -834,7 +834,7 @@ function scorm_course_format_display($user, $course) {
}
function scorm_view_display ($user, $scorm, $action, $cm) {
global $CFG, $DB, $PAGE, $OUTPUT;
global $CFG, $DB, $PAGE, $OUTPUT, $COURSE;
if ($scorm->scormtype != SCORM_TYPE_LOCAL && $scorm->updatefreq == SCORM_UPDATE_EVERYTIME) {
scorm_parse($scorm, false);
@ -913,7 +913,7 @@ function scorm_view_display ($user, $scorm, $action, $cm) {
<label for="a"><?php print_string('newattempt', 'scorm') ?></label>
<?php
}
if (!empty($scorm->popup)) {
if ($COURSE->format != 'scorm' && !empty($scorm->popup)) {
echo '<input type="hidden" name="display" value="popup" />'."\n";
}
?>