From dbe7e6f6b62ac1cac1a93a776bf5a3c2d50076d0 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Tue, 28 Nov 2006 03:04:50 +0000
Subject: [PATCH] Merged better checks for datamodel inclusion from stable

---
 mod/scorm/locallib.php | 3 +++
 mod/scorm/player.php   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 1f94463882..c18044ce75 100755
--- 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 424a1ee20a..51171eba43 100755
--- 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');
-- 
2.39.5