From e6b9308a235036675f537cf2ff00be39cbd2aab7 Mon Sep 17 00:00:00 2001
From: Ben Johnson <bjohson@novologic.com>
Date: Tue, 15 Jan 2013 21:42:56 +1300
Subject: [PATCH] MDL-36421 SCORM: fix SCORM course format new window popups

---
 mod/scorm/locallib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index c2f1c408857..182de2453ce 100644
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -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";
         }
         ?>