Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'm21_MDL-27947' of git://github.com/danmarsden/moodle in…

…to MOODLE_21_STABLE
  • Loading branch information...
commit 903c12c74b7e0d638c07558598f1136b3a86cfa6 2 parents 73d78d8 + 0ae4c47
@samhemelryk samhemelryk authored
Showing with 11 additions and 2 deletions.
  1. +11 −2 mod/scorm/locallib.php
View
13 mod/scorm/locallib.php
@@ -812,13 +812,22 @@ function scorm_simple_play($scorm,$user, $context) {
$scoes = $DB->get_records_select('scorm_scoes', 'scorm = ? AND '.$DB->sql_isnotempty('scorm_scoes', 'launch', false, true), array($scorm->id), 'id', 'id');
if ($scoes) {
+ $orgidentifier = '';
+ if ($sco = scorm_get_sco($scorm->launch, SCO_ONLY)) {
+ if (($sco->organization == '') && ($sco->launch == '')) {
+ $orgidentifier = $sco->identifier;
+ } else {
+ $orgidentifier = $sco->organization;
+ }
+ }
+
if ($scorm->skipview >= 1) {
$sco = current($scoes);
if (scorm_get_tracks($sco->id,$user->id) === false) {
- header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id);
+ header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&currentorg='.$orgidentifier);
$result = true;
} else if ($scorm->skipview == 2) {
- header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id);
+ header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&currentorg='.$orgidentifier);
$result = true;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.