Merge branch 'master_MDL-58863' of https://github.com/danmarsden/moodle

moodle · Jul 18, 2017 · a0f12fc · a0f12fc
2 parents ed539f8 + e63d724
commit a0f12fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mod/scorm/player.php b/mod/scorm/player.php
@@ -272,7 +272,8 @@
                             $scorm->hidetoc, $collapsetocwinsize, $result->toctitle, $name, $sco->id, $adlnav), false, $jsmodule);
 }
 if (!empty($forcejs)) {
-    echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "generalbox boxaligncenter forcejavascriptmessage");
+    $message = $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "generalbox boxaligncenter forcejavascriptmessage");
+    echo html_writer::tag('noscript', $message);
 }
 
 if (file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'.php')) {

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
@@ -176,7 +176,8 @@
     scorm_print_launch($USER, $scorm, 'view.php?id='.$cm->id, $cm);
 }
 if (!empty($forcejs)) {
-    echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
+    $message = $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
+    echo html_writer::tag('noscript', $message);
 }
 
 if (!empty($scorm->popup)) {