lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Label of action is stored html coded instead of as is

Browse Source
This commit is contained in:
Laurent Destailleur 2008-05-07 00:50:24 +00:00
parent c340c932ea
commit df56657d34
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/action/fiche.php
View File

@ -136,13 +136,13 @@ if ($_POST["action"] == 'add_action')
{ {
if ($_POST["actioncode"] == 'AC_RDV' && $contact->getFullName($langs)) if ($_POST["actioncode"] == 'AC_RDV' && $contact->getFullName($langs))
{ {
$actioncomm->label = $langs->trans("TaskRDVWith",$contact->getFullName($langs)); $actioncomm->label = $langs->transnoentities("TaskRDVWith",$contact->getFullName($langs));
} }
else else
{ {
if ($langs->trans("Action".$actioncomm->type_code) != "Action".$actioncomm->type_code) if ($langs->trans("Action".$actioncomm->type_code) != "Action".$actioncomm->type_code)
{ {
$actioncomm->label = $langs->trans("Action".$actioncomm->type_code)."\n"; $actioncomm->label = $langs->transnoentities("Action".$actioncomm->type_code)."\n";
} }
else $actioncomm->label = $cactioncomm->libelle; else $actioncomm->label = $cactioncomm->libelle;
} }
@ -191,6 +191,8 @@ if ($_POST["action"] == 'add_action')
$societe->fetch($_REQUEST["socid"]); $societe->fetch($_REQUEST["socid"]);
$actioncomm->societe = $societe; $actioncomm->societe = $societe;
} }
// Special for module webcal and phenix
if ($_POST["add_webcal"] == 'on' && $conf->webcal->enabled) $actioncomm->use_webcal=1; if ($_POST["add_webcal"] == 'on' && $conf->webcal->enabled) $actioncomm->use_webcal=1;
if ($_POST["add_phenix"] == 'on' && $conf->phenix->enabled) $actioncomm->use_phenix=1; if ($_POST["add_phenix"] == 'on' && $conf->phenix->enabled) $actioncomm->use_phenix=1;