From 68813ee8fffc618dafb72eab578d2c94636b2b50 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Fri, 31 Jan 2025 10:45:30 +0100
Subject: [PATCH] Skill: Fix assignment of subskill to user - refs BT#22372

---
 public/main/skills/assign.php     | 2 +-
 public/main/skills/issued.php     | 4 ++--
 public/main/skills/issued_all.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/main/skills/assign.php b/public/main/skills/assign.php
index cc8691a48fc..d1e8839c94d 100644
--- a/public/main/skills/assign.php
+++ b/public/main/skills/assign.php
@@ -198,7 +198,7 @@
     foreach ($subSkillList as $subSkillId) {
         $children = $skillManager->getChildren($subSkillId);
 
-        if (isset($subSkillList[$counter - 1])) {
+        if (isset($subSkillList[$counter - 1]) && isset($subSkillList[$counter])) {
             $oldSkill = $skillRepo->find($subSkillList[$counter]);
         }
         $skillsOptions = [];
diff --git a/public/main/skills/issued.php b/public/main/skills/issued.php
index a93914b0273..a3c16d3a883 100644
--- a/public/main/skills/issued.php
+++ b/public/main/skills/issued.php
@@ -150,7 +150,7 @@
 }
 
 $acquiredLevel = [];
-$profile = $skillRepo->find($skillId)->getProfile();
+$profile = $skillRepo->find($skillId)->getLevelProfile();
 
 if (!$profile) {
     $skillRelSkill = new SkillRelSkillModel();
@@ -160,7 +160,7 @@
 
     foreach ($parents as $parent) {
         $skillParentId = $parent['skill_id'];
-        $profile = $skillRepo->find($skillParentId)->getProfile();
+        $profile = $skillRepo->find($skillParentId)->getLevelProfile();
 
         if ($profile) {
             break;
diff --git a/public/main/skills/issued_all.php b/public/main/skills/issued_all.php
index 2a78df15711..76c02ed1f8e 100644
--- a/public/main/skills/issued_all.php
+++ b/public/main/skills/issued_all.php
@@ -108,7 +108,7 @@
     }
 
     $acquiredLevel = [];
-    $profile = $skillRepo->find($skillId)->getProfile();
+    $profile = $skillRepo->find($skillId)->getLevelProfile();
 
     if (!$profile) {
         $skillRelSkill = new SkillRelSkillModel();
@@ -118,7 +118,7 @@
 
         foreach ($parents as $parent) {
             $skillParentId = $parent['skill_id'];
-            $profile = $skillRepo->find($skillParentId)->getProfile();
+            $profile = $skillRepo->find($skillParentId)->getLevelProfile();
 
             if ($profile) {
                 break;