From 376c9c70e937c0c9b7053a296bd8640e38b74b83 Mon Sep 17 00:00:00 2001 From: skodak Date: Fri, 30 Mar 2007 21:23:09 +0000 Subject: [PATCH] merging changes from MOODLE_18_STABLE --- mod/resource/type/repository/resource.class.php | 2 +- mod/scorm/datamodel.php | 2 +- mod/scorm/lib.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php index 75400a6bfb..5b6de91b6b 100644 --- a/mod/resource/type/repository/resource.class.php +++ b/mod/resource/type/repository/resource.class.php @@ -69,7 +69,7 @@ function set_parameters() { 'lang' => array('langstr' => get_string('preferredlanguage'), 'value' => current_language()), 'sitename' => array('langstr' => get_string('fullsitename'), - 'value' => $site->fullname), + 'value' => format_string($site->fullname)), 'serverurl' => array('langstr' => get_string('serverurl', 'resource', $CFG), 'value' => $CFG->wwwroot), 'currenttime' => array('langstr' => get_string('time'), diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php index 5332d9b861..bcb4dc3a21 100755 --- a/mod/scorm/datamodel.php +++ b/mod/scorm/datamodel.php @@ -55,7 +55,7 @@ if ($action != $value) { // Evaluating navigation request - //$valid = scorm_sequencing_overall ($scoid,$USER->id,$action); + $valid = scorm_sequencing_overall ($scoid,$USER->id,$action); $valid = 'true'; // Set valid request diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index 9a170a7ef7..65a9b7a98b 100755 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -391,7 +391,7 @@ function scorm_cron () { set_config('scorm_updatetimelast', $timenow); - mtrace('Updating scorm packages which require daily update');//"estamos actualizando" + mtrace('Updating scorm packages which require daily update');//We are updating $scormsupdate = get_records('scorm','updatefreq',UPDATE_EVERYDAY); if (!empty($scormsupdate)) { -- 2.39.5