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

Better Fix

Browse Source
This commit is contained in:
Florian Henry 2013-12-02 10:27:41 +01:00
parent c0ef63fd74
commit 1b38d36f28
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,18 +925,14 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
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"];
//Manage HTML entities description test //Manage HTML entities description test
//Cause $prodser->description is store with htmlentities but $desc no
if ($conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) { if ($conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) {
$desctest=dol_htmlentities($desc, ENT_COMPAT | ENT_HTML401); $testDescNeedTranslated=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
} else { } else {
$desctest=$desc; $testDescNeedTranslated=true;
}
//Test with htmlenties for update and no htmlentities for creation
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]["description"]) && ($testDescNeedTranslated || (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"];
} }
} }