From 5c38091e9cf4027fd6e68a2c514eb949957e497e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 19 Jun 2011 15:54:51 +0000
Subject: [PATCH] Fix: uniformize code
---
htdocs/comm/action/class/actioncomm.class.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 030ad81f28b..c5aa8a226c0 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -599,7 +599,7 @@ class ActionComm extends CommonObject
/**
* Renvoie nom clicable (avec eventuellement le picto)
- * Utilise $this->id, $this->code et $this->libelle
+ * Utilise $this->id, $this->code et $this->label
* @param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
* @param maxlength Nombre de caracteres max dans libelle
* @param class Force style class on a link
@@ -620,15 +620,15 @@ class ActionComm extends CommonObject
$libelle=$langs->trans("Action".$this->type_code);
$libelleshort='';
}
- else if (empty($this->libelle))
+ else if (empty($this->label))
{
$libelle=$langs->trans("Action".$this->type_code);
$libelleshort=$langs->trans("Action".$this->type_code,'','','','',$maxlength);
}
else
{
- $libelle=$this->libelle;
- $libelleshort=dol_trunc($this->libelle,$maxlength);
+ $libelle=$this->label;
+ $libelleshort=dol_trunc($this->label,$maxlength);
}
if ($withpicto)
--
GitLab