From c39896e85d06c1a5c4850fdc8b9b574a363ccfb7 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 5 Apr 2013 14:34:07 +0800 Subject: [PATCH] Revert "MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets" This reverts commit fe104762c9acb0e178ae1d5ffe514c8109f48f0a. --- mod/scorm/datamodels/debug.js.php | 8 -------- mod/scorm/loadSCO.php | 14 +++----------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/mod/scorm/datamodels/debug.js.php b/mod/scorm/datamodels/debug.js.php index 9011ab906dc..1ef9d1a6fd3 100644 --- a/mod/scorm/datamodels/debug.js.php +++ b/mod/scorm/datamodels/debug.js.php @@ -737,14 +737,6 @@ function LogAPICall(func, nam, val, rc) { } s += ' => ' + String(rc); AppendToLog(s, rc); -scormtype == 'asset')) { -?> - hint = 'Item identifier; ?> has been defined as an Asset: it should never call the SCORM API'; - AppendToLog(hint, 101); - } diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php index a1924b9698e..dd569c1a362 100644 --- a/mod/scorm/loadSCO.php +++ b/mod/scorm/loadSCO.php @@ -161,19 +161,11 @@ if (scorm_external_link($sco->launch)) { add_to_log($course->id, 'scorm', 'launch', 'view.php?id='.$cm->id, $result, $cm->id); -header('Content-Type: text/html; charset=UTF-8'); - -if ($sco->scormtype == 'asset') { - // HTTP 302 Found => Moved Temporarily. - header('Location: ' . $result); - // Provide a short feedback in case of slow network connection. - echo '

' . get_string('activitypleasewait', 'scorm'). '

'; - exit; -} - -// We expect a SCO: select which API are we looking for. +// which API are we looking for $LMS_api = (scorm_version_check($scorm->version, SCORM_12) || empty($scorm->version)) ? 'API' : 'API_1484_11'; +header('Content-Type: text/html; charset=UTF-8'); + ?>