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

Better test for HTMLentities desc translation

Browse Source
This commit is contained in:
Florian Henry 2013-12-02 00:20:50 +01:00
parent 11efc20755
commit ff9c84fd0e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/lib/pdf.lib.php
View File

@ -923,7 +923,19 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
{ {
if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label=$prodser->multilangs[$outputlangs->defaultlang]["label"]; if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && strpos($desc,$prodser->description)!==false) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
//Manage HTML entities description test
if ($conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) {
$desctest=dol_htmlentities($desc, ENT_COMPAT | ENT_HTML401);
} else {
$desctest=$desc;
}
if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) &&
((strpos($desctest,$prodser->description)!==false) ||
(strpos($desc,$prodser->description)!==false))) {
$desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
}
if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"]; if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
} }
} }