moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Poltawski 2013-01-21 09:01:00 +08:00
commit 3be10301e9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/scorm/locallib.php
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";
}
?>