DataObjects/Core_person_signup.php

[Pman.Core] / SimpleExcel.php

diff --git a/SimpleExcel.php b/SimpleExcel.php
index 8d1db39..bd14f80 100644 (file)
--- 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 =    $cl[$col_cfg['dataIndex']]  ;
+                
             }else{
                 if(isset($col_cfg['fillBlank'])){
                     $worksheet->write($start_row+$r, $c, '', $formats[$col_cfg['fillBlank']]);
@@ -327,7 +327,7 @@ class Pman_Core_SimpleExcel extends Pman
                 continue;
             }
             
-            $v = @iconv('UTF-8', 'UTF-8//IGNORE', $v);
+            $v = @iconv('UTF-8', 'UTF-8//TRANSLIT//IGNORE', $v);
             
             $dataFormat = empty($col_cfg['dataFormat']) ? '' : $col_cfg['dataFormat'];