merging changes from MOODLE_18_STABLE

diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index 75400a6bfbd7a7499e0829d42103728257dd0d1d..5b6de91b6bf046e27b5efffed78449e1a5b23f74 100644 (file)
--- 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 5332d9b8612cb08cf372f65fbf657e03ebee2299..bcb4dc3a21015db2c3032ce2636c9ab0ead539ad 100755 (executable)
--- 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 9a170a7ef7548789f84bf4c8dc68dcbbe2d5fc10..65a9b7a98b9b4b7bd980f14610ba36841c60d6bb 100755 (executable)
--- 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)) {