Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…to MOODLE_24_STABLE
  • Loading branch information...
commit cf82c45de999f3fb872f83341c91c9afc2865bd4 2 parents bf14c15 + d8088a3
Dan Poltawski authored January 21, 2013

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  mod/scorm/locallib.php
4  mod/scorm/locallib.php
@@ -834,7 +834,7 @@ function scorm_course_format_display($user, $course) {
834 834
 }
835 835
 
836 836
 function scorm_view_display ($user, $scorm, $action, $cm) {
837  
-    global $CFG, $DB, $PAGE, $OUTPUT;
  837
+    global $CFG, $DB, $PAGE, $OUTPUT, $COURSE;
838 838
 
839 839
     if ($scorm->scormtype != SCORM_TYPE_LOCAL && $scorm->updatefreq == SCORM_UPDATE_EVERYTIME) {
840 840
         scorm_parse($scorm, false);
@@ -913,7 +913,7 @@ function scorm_view_display ($user, $scorm, $action, $cm) {
913 913
                       <label for="a"><?php print_string('newattempt', 'scorm') ?></label>
914 914
             <?php
915 915
         }
916  
-        if (!empty($scorm->popup)) {
  916
+        if ($COURSE->format != 'scorm' && !empty($scorm->popup)) {
917 917
             echo '<input type="hidden" name="display" value="popup" />'."\n";
918 918
         }
919 919
         ?>

0 notes on commit cf82c45

Please sign in to comment.
Something went wrong with that request. Please try again.