From b551ef0e163aa66570da656dff0a4e39af269435 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 6 Mar 2019 09:55:46 -0500 Subject: [PATCH] Skils: Fix assertion page with skill without course - refs BT#15374 --- main/inc/lib/skill.lib.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php index 6d33786e92..28283aa138 100755 --- a/main/inc/lib/skill.lib.php +++ b/main/inc/lib/skill.lib.php @@ -597,17 +597,21 @@ class SkillRelUser extends Model * * @param int $userId The user id * @param int $skillId The skill id - * @param int $courseId The course id + * @param int $courseId Optional. The course id * @param int $sessionId Optional. The session id * * @return array The relation data. Otherwise return false */ - public function getByUserAndSkill($userId, $skillId, $courseId, $sessionId = 0) + public function getByUserAndSkill($userId, $skillId, $courseId = 0, $sessionId = 0) { - $sessionCondition = api_get_session_condition($sessionId, true); + $sql = "SELECT * FROM {$this->table} WHERE user_id = %d AND skill_id = %d "; + + if ($courseId > 0) { + $sql .= "AND course_id = %d ".api_get_session_condition($sessionId, true); + } $sql = sprintf( - "SELECT * FROM {$this->table} WHERE user_id = %d AND skill_id = %d AND course_id = %d $sessionCondition", + $sql, $userId, $skillId, $courseId