Skip to content
Snippets Groups Projects
Commit 02f47b5a authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

parents 4feecbea 0630542e
No related branches found
No related tags found
No related merge requests found
...@@ -327,7 +327,7 @@ if (empty($reshook)) ...@@ -327,7 +327,7 @@ if (empty($reshook))
$label = $lines[$i]->product_label; $label = $lines[$i]->product_label;
} }
$desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):''; $desc = ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
} }
else { else {
$desc = dol_htmlentitiesbr($lines[$i]->desc); $desc = dol_htmlentitiesbr($lines[$i]->desc);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment