From 9822473ef5985dcd58aa70d50390f97e6c63075c Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Tue, 12 Apr 2016 10:15:12 +0200 Subject: [PATCH] Set course id to fix PHP notice --- main/exercice/exercise.class.php | 5 +++-- main/gradebook/lib/be/category.class.php | 3 ++- main/gradebook/lib/be/exerciselink.class.php | 13 +++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 1a0b93bb88..18a011ac3e 100755 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -132,6 +132,7 @@ class Exercise $id = intval($id); if (empty($this->course_id)) { + return false; } $sql = "SELECT * FROM $TBL_EXERCISES WHERE c_id = ".$this->course_id." AND id = ".$id; @@ -5797,10 +5798,10 @@ class Exercise */ private function setMediaList($questionList) { - $mediaList= array(); + $mediaList = array(); if (!empty($questionList)) { foreach ($questionList as $questionId) { - $objQuestionTmp = Question::read($questionId); + $objQuestionTmp = Question::read($questionId, $this->course_id); // If a media question exists if (isset($objQuestionTmp->parent_id) && $objQuestionTmp->parent_id != 0) { diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php index 4a9cec84cd..4d20dad52c 100755 --- a/main/gradebook/lib/be/category.class.php +++ b/main/gradebook/lib/be/category.class.php @@ -897,6 +897,8 @@ class Category implements GradebookItem if (!empty($cats)) { /** @var Category $cat */ foreach ($cats as $cat) { + $cat->set_session_id($session_id); + $cat->set_course_code($course_code); $cat->setStudentList($this->getStudentList()); $score = $cat->calc_score( $stud_id, @@ -2299,5 +2301,4 @@ class Category implements GradebookItem { $this->studentList = $list; } - } diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php index ad5f0aa551..aeea7bcc5d 100755 --- a/main/gradebook/lib/be/exerciselink.class.php +++ b/main/gradebook/lib/be/exerciselink.class.php @@ -173,7 +173,8 @@ class ExerciseLink extends AbstractLink exe_exo_id = ".(int)$this->get_ref_id(); $result = Database::query($sql); $number=Database::fetch_row($result); - return ($number[0] != 0); + + return $number[0] != 0; } /** @@ -192,7 +193,7 @@ class ExerciseLink extends AbstractLink /* the following query should be similar (in conditions) to the one used in exercice/exercice.php, look for note-query-exe-results marker*/ - $session_id = api_get_session_id(); + $session_id = $this->get_session_id(); $courseId = $this->getCourseId(); $exercise = new Exercise($courseId); $exercise->read($this->get_ref_id()); @@ -207,8 +208,8 @@ class ExerciseLink extends AbstractLink orig_lp_item_id = 0 AND status <> 'incomplete' AND session_id = $session_id AND - c_id = $courseId - "; + c_id = $courseId + "; } else { $lpId = null; if (!empty($exercise->lpList)) { @@ -223,8 +224,8 @@ class ExerciseLink extends AbstractLink orig_lp_id = $lpId AND status <> 'incomplete' AND session_id = $session_id AND - c_id = $courseId - "; + c_id = $courseId + "; } if (!empty($stud_id) && $type != 'ranking') {