From 9da19de860e197cd4fb84861a14090fbdf005cb4 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Mon, 25 Jan 2016 17:10:39 +0000 Subject: [PATCH] Suppress "Notice" messages when iconv detects invalid UTF-8 characters, since it breaks the JSON output if display_errors in On... SVN:trunk[3878] --- core/csvbulkexport.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/csvbulkexport.class.inc.php b/core/csvbulkexport.class.inc.php index a64049a82..c5031d909 100644 --- a/core/csvbulkexport.class.inc.php +++ b/core/csvbulkexport.class.inc.php @@ -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 // 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"; @@ -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 // 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 {