mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 17:06:53 +02:00
Merged better checks for datamodel inclusion from stable
This commit is contained in:
parent
faf01ee4de
commit
dbe7e6f6b6
2 changed files with 4 additions and 1 deletions
|
@ -550,6 +550,9 @@ function scorm_view_display ($user, $scorm, $action, $cm, $boxwidth='') {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR)); // Just to be safe
|
$scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR)); // Just to be safe
|
||||||
|
if (!file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php')) {
|
||||||
|
$scorm->version = 'scorm_12';
|
||||||
|
}
|
||||||
require_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php');
|
require_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php');
|
||||||
|
|
||||||
$result = scorm_get_toc($user,$scorm,'structlist',$orgidentifier);
|
$result = scorm_get_toc($user,$scorm,'structlist',$orgidentifier);
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
// TOC processing
|
// TOC processing
|
||||||
//
|
//
|
||||||
$scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR)); // Just to be safe
|
$scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR)); // Just to be safe
|
||||||
if (!file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php') {
|
if (!file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php')) {
|
||||||
$scorm->version = 'scorm_12';
|
$scorm->version = 'scorm_12';
|
||||||
}
|
}
|
||||||
require_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php');
|
require_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue