Permalink
Browse files

Merge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle in…

…to MOODLE_23_STABLE
  • Loading branch information...
2 parents a2400fc + e6b9308 commit 0d674390c35a7d52e538e01d80ef285f1103e2ce @danpoltawski danpoltawski committed Jan 21, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 mod/scorm/locallib.php
View
@@ -745,7 +745,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);
@@ -824,7 +824,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";
}
?>

0 comments on commit 0d67439

Please sign in to comment.