From: Alan Knowles <alan@roojs.com>
Date: Fri, 12 Sep 2014 05:25:39 +0000 (+0800)
Subject: SimpleExcel.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=1968312b6a28953e302379ad9edbe6f8bbb042e5

SimpleExcel.php
---

diff --git a/SimpleExcel.php b/SimpleExcel.php
index e3a4cd20..8d1db398 100644
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -302,7 +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 = iconv("UTF-8", "UTF-8//IGNORE", $cl[$col_cfg['dataIndex']]);
+                $v = $cl[$col_cfg['dataIndex']];
             }else{
                 if(isset($col_cfg['fillBlank'])){
                     $worksheet->write($start_row+$r, $c, '', $formats[$col_cfg['fillBlank']]);