Fix correct use of exercise id

main/gradebook/index.php

@@ -39,11 +39,21 @@ switch ($action) {
         if (!empty($itemId)) {
             $link = LinkFactory::create(LINK_EXERCISE);
             $links = $link::load($itemId);
+
+            $exercise = new Exercise(api_get_course_int_id());
             /** @var ExerciseLink $link */
             foreach ($links as $link) {
-                $exercise = new Exercise(api_get_course_int_id());
-                $exercise->read($link->get_ref_id());
-                $exercise->generateStats($link->get_ref_id(), api_get_course_info(), api_get_session_id());
+                $exerciseId = $link->get_ref_id();
+                $data = $link->get_exercise_data();
+                if (empty($data)) {
+                    continue;
+                }
+
+                $exerciseId = $data['id'];
+                $result = $exercise->read($exerciseId);
+                if ($result) {
+                    $exercise->generateStats($exerciseId, api_get_course_info(), api_get_session_id());
+                }
             }
             Display::addFlash(Display::return_message(get_lang('Updated')));
         }

main/gradebook/lib/be/exerciselink.class.php

@@ -262,7 +262,7 @@ class ExerciseLink extends AbstractLink
         }
 
         $exercise = new Exercise($courseId);
-        $exercise->read($exerciseData['id']);
+        $exercise->read($exerciseId);
 
         if (!$this->is_hp) {
             if ($exercise->exercise_was_added_in_lp == false) {
@@ -573,7 +573,7 @@ class ExerciseLink extends AbstractLink
     /**
      * Lazy load function to get the database contents of this exercise.
      */
-    private function get_exercise_data()
+    public function get_exercise_data()
     {
         $tableItemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
         if ($this->is_hp == 1) {
@@ -584,29 +584,27 @@ class ExerciseLink extends AbstractLink
 
         $exerciseId = $this->get_ref_id();
 
-        if ($table == '') {
-            return false;
-        } elseif (empty($this->exercise_data)) {
+        if (empty($this->exercise_data)) {
             if ($this->is_hp == 1) {
                 $sql = "SELECT * FROM $table ex
-                        INNER JOIN $tableItemProperty ip
-                        ON (ip.ref = ex.id AND ip.c_id = ex.c_id)
-                        WHERE
-                            ip.c_id = $this->course_id AND
-                            ex.c_id = $this->course_id AND
-                            ip.ref = $exerciseId AND
-                            ip.tool = '".TOOL_DOCUMENT."' AND
-                            ex.path LIKE '%htm%' AND
-                            ex.path LIKE '%HotPotatoes_files%' AND
-                            ip.visibility = 1";
+                    INNER JOIN $tableItemProperty ip
+                    ON (ip.ref = ex.id AND ip.c_id = ex.c_id)
+                    WHERE
+                        ip.c_id = $this->course_id AND
+                        ex.c_id = $this->course_id AND
+                        ip.ref = $exerciseId AND
+                        ip.tool = '".TOOL_DOCUMENT."' AND
+                        ex.path LIKE '%htm%' AND
+                        ex.path LIKE '%HotPotatoes_files%' AND
+                        ip.visibility = 1";
                 $result = Database::query($sql);
                 $this->exercise_data = Database::fetch_array($result);
             } else {
                 // Try with iid
                 $sql = 'SELECT * FROM '.$table.'
-                        WHERE
-                            c_id = '.$this->course_id.' AND
-                            iid = '.$exerciseId;
+                    WHERE
+                        c_id = '.$this->course_id.' AND
+                        iid = '.$exerciseId;
                 $result = Database::query($sql);
                 $rows = Database::num_rows($result);
 
@@ -615,15 +613,19 @@ class ExerciseLink extends AbstractLink
                 } else {
                     // Try wit id
                     $sql = 'SELECT * FROM '.$table.'
-                            WHERE
-                                c_id = '.$this->course_id.' AND
-                                id = '.$exerciseId;
+                        WHERE
+                            c_id = '.$this->course_id.' AND
+                            id = '.$exerciseId;
                     $result = Database::query($sql);
                     $this->exercise_data = Database::fetch_array($result);
                 }
             }
         }
 
+        if (empty($this->exercise_data)) {
+            return false;
+        }
+
         return $this->exercise_data;
     }
 }