Browse Source

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 6 years ago
parent
commit
f6cdd0ef5e

+ 1 - 1
main/exercise/recalculate.php

@@ -103,4 +103,4 @@ $sql = "UPDATE $table SET
         WHERE exe_id = $exeId";
 Database::query($sql);
 
-echo $totalScore.'/'.$totalWeight;
+echo $totalScore.'/'.$totalWeight;

+ 1 - 2
main/inc/lib/agenda.lib.php

@@ -1340,14 +1340,13 @@ class Agenda
     }
 
     /**
-     * Clean events
+     * Clean events.
      *
      * @return bool
      */
     public function cleanEvents()
     {
         if (empty($this->events)) {
-
             return false;
         }
 

+ 2 - 1
main/lp/scorm_api.php

@@ -1444,6 +1444,8 @@ function switch_item(current_item, next_item) {
         return false;
     }
 
+    olms.switch_finished = 0; //only changed back once LMSInitialize() happens
+
     // backup these params
     var orig_current_item   = current_item;
     var orig_next_item      = next_item;
@@ -1689,7 +1691,6 @@ function switch_item(current_item, next_item) {
             }
         }
     });
-    olms.switch_finished = 0; //only changed back once LMSInitialize() happens
 
     loadForumThread(olms.lms_lp_id, next_item);
     checkCurrentItemPosition(olms.lms_item_id);

+ 4 - 0
main/mySpace/myStudents.php

@@ -34,6 +34,10 @@ if (empty($student_id)) {
 // user info
 $user_info = api_get_user_info($student_id);
 
+if (empty($user_info)) {
+    api_not_allowed(true);
+}
+
 $allowToQualify = api_is_allowed_to_edit(null, true) ||
     api_is_course_tutor() ||
     api_is_session_admin() ||