From b757573e79df3e32ffa52addaf481b0ab9e50c9c Mon Sep 17 00:00:00 2001
From: Clecle <aurelienclerac@hotmail.fr>
Date: Sat, 21 Nov 2015 18:03:32 +0100
Subject: [PATCH] =?UTF-8?q?Erreur=20li=C3=A9=20au=20merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page/career.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/page/career.php b/page/career.php
index 13f15fc..11e97f3 100755
--- a/page/career.php
+++ b/page/career.php
@@ -351,7 +351,7 @@ elseif( permission('teacher') ){ // si enseignant et qu'un contrôle est spécif
 				echo "<th colspan=5 style='font-size:1.5em; text-align:center;'>".$answer->controle['nom'].' - '.$answer->controle['libelle'].'</th>';
 
 			echo '<tr>';
-				echo "<th><span class='link ctrl' data-ctrl='".$answer->controle['id']."'>".$answer->controle['libelle']."</span></th>";
+				echo "<th><span class='link ctrl' data-ctrl='".$answer->controle['nom']."'>".$answer->controle['libelle']."</span></th>";
 				
 				echo "<th>".$answer->controle['module']." - ".$answer->controle['modulelib']."</th>";