Merge branch 'm31_MDL-50643' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE

mod/scorm/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016052300;    // The current module version (Date: YYYYMMDDXX).
+$plugin->version   = 2016052301;    // The current module version (Date: YYYYMMDDXX).
 $plugin->requires  = 2016051900;    // Requires this Moodle version.
 $plugin->component = 'mod_scorm';   // Full name of the plugin (used for diagnostics).
 $plugin->cron      = 300;

mod/scorm/view.js

@@ -46,8 +46,7 @@ M.mod_scormform.init = function(Y) {
         // Onunload is called multiple times in the SCORM window - we only want to handle when it is actually closed.
         setTimeout(function() {
             if (winobj.closed) {
-                // Redirect the parent window to the course homepage.
-                parent.window.location = course_url;
+                window.location = course_url;
             }
         }, 800)
     }