2
0
forked from Wavyzz/dolibarr

Fix: [ bug #253 ] Non UTF-8 characters in CSV exports

This commit is contained in:
Laurent Destailleur
2011-12-21 16:10:11 +01:00
parent b75688f76b
commit 721c9a6f5b
2 changed files with 8 additions and 7 deletions

View File

@@ -3524,12 +3524,13 @@ function picto_required()
*
* @param StringHtml String to clean
* @param removelinefeed Replace also all lines feeds by a space
* @param pagecodeto Encoding of input string
* @return string String cleaned
*/
function dol_string_nohtmltag($StringHtml,$removelinefeed=1)
function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
{
$pattern = "/<[^>]+>/";
$temp = dol_entity_decode($StringHtml);
$temp = dol_entity_decode($StringHtml,$pagecodeto);
$temp = preg_replace($pattern,"",$temp);
// Supprime aussi les retours