From 09ed5bd3382ea4129e913e33cd6446de63e1a322 Mon Sep 17 00:00:00 2001 From: Herve Prot Date: Sat, 6 Aug 2011 23:10:35 +0200 Subject: [PATCH] Fix bug cactioncomm class --- htdocs/comm/action/class/cactioncomm.class.php | 5 ++++- htdocs/custom/highCharts | 2 +- htdocs/custom/team | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index be9edbb5a427d..affcc759dfeed 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -175,7 +175,10 @@ function getNomUrl($withpicto=0) // Check if translation available $transcode=$langs->trans("Action".$this->code); - if ($transcode != "Action".$this->code) return $transcode; + if ($transcode != "Action".$this->code) + return $transcode; + else + return $this->libelle; } } diff --git a/htdocs/custom/highCharts b/htdocs/custom/highCharts index 1bcc2c5b3538a..7c08b587ae972 160000 --- a/htdocs/custom/highCharts +++ b/htdocs/custom/highCharts @@ -1 +1 @@ -Subproject commit 1bcc2c5b3538a826748cc7ca27c0bfe8721c754f +Subproject commit 7c08b587ae97287853dbcce4ad553a9437b63bd4 diff --git a/htdocs/custom/team b/htdocs/custom/team index 7bc643e5f5e11..9c169fbb88c9b 160000 --- a/htdocs/custom/team +++ b/htdocs/custom/team @@ -1 +1 @@ -Subproject commit 7bc643e5f5e1142bf5ba39ea31664bd147fdf0fd +Subproject commit 9c169fbb88c9bc5a69ae9aa21486aac7e9d1fd93