Merged better checks for datamodel inclusion from stable

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 1f9446388258f48ee7e2489186ac5276dfa60266..c18044ce7536cf1478af5c5fa05c725cf683841f 100755 (executable)
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -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
+    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');
 
     $result = scorm_get_toc($user,$scorm,'structlist',$orgidentifier);

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 424a1ee20ab0b1339cc3c1d8f6ee06b5148531db..51171eba43e8f1d9425792fd960b437481bb180b 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -71,7 +71,7 @@
     // TOC processing
     //
     $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';
     }
     require_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php');