From ef1916f0db3241367fc4abb077599afdcaa8f42d Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 18 Nov 2023 14:15:34 +0100 Subject: [PATCH] Fix : translated product desc was overwriting desc even if text was added after (#26687) --- htdocs/core/lib/pdf.lib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index bff1f1f92ee..3ac72e0d2c2 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1440,8 +1440,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, } else { $textwasnotmodified = ($desc == $prodser->description); } - if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasnotmodified || $translatealsoifmodified)) { - $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"]; + if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"])) { + if ($textwasnotmodified) { + $desc = str_replace($prodser->description, $prodser->multilangs[$outputlangs->defaultlang]["description"], $desc); + } elseif ($translatealsoifmodified) { + $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"]; + } } // Set note