瀏覽代碼

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

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3878 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 9 年之前
父節點
當前提交
ff7feebdd4
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      core/csvbulkexport.class.inc.php

+ 2 - 2
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
 				{