From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 16 Sep 2013 21:02:32 +0000 (+1200)
Subject: Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
X-Git-Tag: v2.6.0-beta~326
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=77365f7ff68f292860459184d1aebcbd6987e8d8;hp=f34af1167acb6696d188fb64a8b65336fd36a789

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

diff --git a/mod/scorm/view.js b/mod/scorm/view.js
index 29e531cb7fd..9884d0a75b3 100644
--- a/mod/scorm/view.js
+++ b/mod/scorm/view.js
@@ -4,13 +4,12 @@ M.mod_scormform.init = function(Y) {
     var cwidth = scormplayerdata.cwidth;
     var cheight = scormplayerdata.cheight;
     var poptions = scormplayerdata.popupoptions;
-    var courseid = scormplayerdata.courseid;
     var launch = scormplayerdata.launch;
     var currentorg = scormplayerdata.currentorg;
     var sco = scormplayerdata.sco;
     var scorm = scormplayerdata.scorm;
     var launch_url = M.cfg.wwwroot+"/mod/scorm/player.php?a="+scorm+"&currentorg="+currentorg+"&scoid="+sco+"&sesskey="+M.cfg.sesskey;
-    var course_url = M.cfg.wwwroot+"/course/view.php?id="+courseid+"&sesskey="+M.cfg.sesskey;
+    var course_url = scormplayerdata.courseurl;
 
     if ((cwidth==100) && (cheight==100)) {
         poptions = poptions+',width='+screen.availWidth+',height='+screen.availHeight+',left=0,top=0';
diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index e9027d1275e..24d03644992 100644
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -83,11 +83,19 @@ if (!empty($scorm->popup)) {
             $launch = true;
         }
     }
+    // Redirect back to the section with one section per page ?
+
+    $courseformat = course_get_format($course)->get_course();
+    $sectionid = '';
+    if (isset($courseformat->coursedisplay) && $courseformat->coursedisplay == COURSE_DISPLAY_MULTIPAGE) {
+        $sectionid = $cm->section;
+    }
+
     $PAGE->requires->data_for_js('scormplayerdata', Array('launch' => $launch,
                                                            'currentorg' => $orgidentifier,
                                                            'sco' => $scoid,
                                                            'scorm' => $scorm->id,
-                                                           'courseid' => $scorm->course,
+                                                           'courseurl' => course_get_url($course, $sectionid)->out(false),
                                                            'cwidth' => $scorm->width,
                                                            'cheight' => $scorm->height,
                                                            'popupoptions' => $scorm->options), true);