composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Suppress "Notice" messages when iconv detects invalid UTF-8 characters, since it breaks the JSON output if display_errors in On...

Browse Source 
SVN:trunk[3878]
This commit is contained in:
Denis Flaven
2016-01-25 17:10:39 +00:00
parent b8af72b402
commit 9da19de860
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/csvbulkexport.class.inc.php
View File

@@ -210,7 +210,7 @@ class CSVBulkExport extends TabularBulkExport
{ {
// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string // Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
// and thus to convert field by field and not the whole row or file at once (see ticket #991) // and thus to convert field by field and not the whole row or file at once (see ticket #991)
$aData[$idx] = iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $aData[$idx]); $aData[$idx] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $aData[$idx]);
} }
} }
$sData = implode($this->aStatusInfo['separator'], $aData)."\n"; $sData = implode($this->aStatusInfo['separator'], $aData)."\n";
@@ -258,7 +258,7 @@ class CSVBulkExport extends TabularBulkExport
{ {
// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string // Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
// and thus to convert field by field and not the whole row or file at once (see ticket #991) // and thus to convert field by field and not the whole row or file at once (see ticket #991)
$aData[] = iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $sField); $aData[] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $sField);
} }
else else
{ {