Permalink
Browse files

Merge branch 'm23_MDL-35737' of git://github.com/danmarsden/moodle in…

…to MOODLE_23_STABLE
  • Loading branch information...
2 parents 3ad9a3f + 6410028 commit 8869233e2696a2e7fad84ad6adf2bd893fcd44b8 @danpoltawski danpoltawski committed Dec 12, 2012
Showing with 3 additions and 6 deletions.
  1. +3 −6 mod/scorm/locallib.php
@@ -250,9 +250,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)) {
@@ -847,13 +844,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) {

0 comments on commit 8869233

Please sign in to comment.