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

Avoid strpos bug if string is empty or null

Browse Source
This commit is contained in:
Florian Henry 2013-12-02 11:05:07 +01:00
parent 1ad1b25f6e
commit 0907d81fcb
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -926,13 +926,21 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
//Manage HTML entities description test
//Cause $prodser->description is store with htmlentities but $desc no
$testHTMLDescNeedTranslated=true;
$testDescNeedTranslated=true;
if ($conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) {
$testDescNeedTranslated=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
if (!empty($desc) && !empty($prodser->description)) {
$testHTMLDescNeedTranslated=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
}
} else {
$testDescNeedTranslated=true;
if (!empty($desc) && !empty($prodser->description)) {
$testDescNeedTranslated = (strpos($desc,$prodser->description)!==false);
} else {
$testDescNeedTranslated=false;
}
}
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]["description"]) && ($testHTMLDescNeedTranslated || $testDescNeedTranslated)) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
}
}