From 77e889a0ef0afaa99182db58dc8a4fe701d70ba4 Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Thu, 17 Mar 2011 18:15:42 +0100 Subject: [PATCH] MDL-26863: fixed regression by an appropriate Merging From Branch using 1.9 --- mod/scorm/datamodels/debug.js.php | 1 - mod/scorm/datamodels/scorm_12.js.php | 1 + mod/scorm/datamodels/scorm_13.js.php | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/scorm/datamodels/debug.js.php b/mod/scorm/datamodels/debug.js.php index 8976d129765..ce27636246d 100644 --- a/mod/scorm/datamodels/debug.js.php +++ b/mod/scorm/datamodels/debug.js.php @@ -735,5 +735,4 @@ if (getLoggingActive() == "A") { } var content = safeGetElement(document, 'scormpage'); content.insertBefore(logButton, content.firstChild); -AppendToLog("Moodle SCORM 1.2 API Loaded, Activity: name; ?>, SCO: identifier; ?>", 0); diff --git a/mod/scorm/datamodels/scorm_12.js.php b/mod/scorm/datamodels/scorm_12.js.php index 73318133e51..8d466a4695b 100644 --- a/mod/scorm/datamodels/scorm_12.js.php +++ b/mod/scorm/datamodels/scorm_12.js.php @@ -641,6 +641,7 @@ var API = new SCORMapi1_2(); // pull in the debugging utilities if (scorm_debugging($scorm)) { include_once($CFG->dirroot.'/mod/scorm/datamodels/debug.js.php'); + echo 'AppendToLog("Moodle SCORM 1.2 API Loaded, Activity: '.$scorm->name.', SCO: '.$sco->identifier.'", 0);'; } ?> diff --git a/mod/scorm/datamodels/scorm_13.js.php b/mod/scorm/datamodels/scorm_13.js.php index fd514a88566..5fdce9a8cd1 100644 --- a/mod/scorm/datamodels/scorm_13.js.php +++ b/mod/scorm/datamodels/scorm_13.js.php @@ -1278,5 +1278,6 @@ var API_1484_11 = new SCORMapi1_3(); // pull in the debugging utilities if (scorm_debugging($scorm)) { include_once($CFG->dirroot.'/mod/scorm/datamodels/debug.js.php'); + echo 'AppendToLog("Moodle SCORM 1.3 API Loaded, Activity: '.$scorm->name.', SCO: '.$sco->identifier.'", 0);'; } ?>