From db7f1ca70e814806cecbcef07824bf4c785a5339 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 26 Oct 2012 15:13:39 +1300 Subject: [PATCH] MDL-35737 SCORM: when scorm_parse is called and external scorm manifest use always update the package. --- mod/scorm/locallib.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php index 57088dcafea..938106ef3f8 100644 --- a/mod/scorm/locallib.php +++ b/mod/scorm/locallib.php @@ -263,9 +263,6 @@ function scorm_parse($scorm, $full) { } } else if ($scorm->scormtype === SCORM_TYPE_EXTERNAL and $cfg_scorm->allowtypeexternal) { - if (!$full and $scorm->sha1hash === sha1($scorm->reference)) { - return; - } require_once("$CFG->dirroot/mod/scorm/datamodels/scormlib.php"); // SCORM only, AICC can not be external if (!scorm_parse_scorm($scorm, $scorm->reference)) { @@ -936,13 +933,13 @@ function scorm_simple_play($scorm, $user, $context, $cmid) { $result = false; - if ($scorm->scormtype != SCORM_TYPE_LOCAL && $scorm->updatefreq == SCORM_UPDATE_EVERYTIME) { - scorm_parse($scorm, false); - } if (has_capability('mod/scorm:viewreport', $context)) { //if this user can view reports, don't skipview so they can see links to reports. return $result; } + if ($scorm->scormtype != SCORM_TYPE_LOCAL && $scorm->updatefreq == SCORM_UPDATE_EVERYTIME) { + scorm_parse($scorm, false); + } $scoes = $DB->get_records_select('scorm_scoes', 'scorm = ? AND '.$DB->sql_isnotempty('scorm_scoes', 'launch', false, true), array($scorm->id), 'id', 'id'); if ($scoes) {