MDL-16299 - Javascript error during scorm player load. Ensure SCOID is always populated.

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 38126ac614c0391594c4aa0a71746b9731b80f9d..ef864992178e07875519623d161fbd12c7971391 100755 (executable)
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -606,11 +606,10 @@ function scorm_view_display ($user, $scorm, $action, $cm, $boxwidth='') {
 
 ?>
             <div class="scorm-center">
-               <form id="theform" method="post" action="<?php echo $CFG->wwwroot ?>/mod/scorm/player.php?scoid=<?php echo $sco->id ?>&amp;id=<?php echo $cm->id ?>">
+               <form id="theform" method="post" action="<?php echo $CFG->wwwroot ?>/mod/scorm/player.php?scoid=<?php echo $sco->id ?>&amp;id=<?php echo $cm->id ?>&amp;currentorg=<?php echo $orgidentifier ?>">
               <?php
                   if ($scorm->hidebrowse == 0) {
                       print_string('mode','scorm');
-                      echo '<input type="hidden" name="scoid" value="'.$sco->id.'" />'."\n";
                       echo ': <input type="radio" id="b" name="mode" value="browse" /><label for="b">'.get_string('browse','scorm').'</label>'."\n";
                       echo '<input type="radio" id="n" name="mode" value="normal" checked="checked" /><label for="n">'.get_string('normal','scorm')."</label>\n";
                   } else {
@@ -625,7 +624,8 @@ function scorm_view_display ($user, $scorm, $action, $cm, $boxwidth='') {
                   }
               ?>
               <br />
-              <input type="hidden" name="scoid"/>
+              <input type="hidden" name="id" value="<?php echo $cm->id ?>"/>
+              <input type="hidden" name="scoid" value="<?php echo $sco->id ?>"/>
               <input type="hidden" name="currentorg" value="<?php echo $orgidentifier ?>" />
               <input type="submit" value="<?php print_string('enter','scorm') ?>" />
               </form>