X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=SimpleExcel.php;h=23a81b5bd6e70b37d392056ec3518cb588482b6f;hb=87f39255894912100f4a55fb0f5a36d045f43031;hp=8d1db39870e98fdd64f09e1997d12a8be043df10;hpb=1968312b6a28953e302379ad9edbe6f8bbb042e5;p=Pman.Core

diff --git a/SimpleExcel.php b/SimpleExcel.php
index 8d1db398..23a81b5b 100644
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -302,8 +302,8 @@ class Pman_Core_SimpleExcel extends Pman
         foreach($cfg['cols']  as $c=>$col_cfg) {
             
             if(isset($col_cfg['dataIndex']) && isset($cl[$col_cfg['dataIndex']])){
-                //$v = iconv("UTF-8", "UTF-8//IGNORE", $cl[$col_cfg['dataIndex']]);
-                $v = $cl[$col_cfg['dataIndex']];
+                $v = @iconv("UTF-8", "UTF-8//IGNORE", $cl[$col_cfg['dataIndex']]);
+                
             }else{
                 if(isset($col_cfg['fillBlank'])){
                     $worksheet->write($start_row+$r, $c, '', $formats[$col_cfg['fillBlank']]);