projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4c7b13f
)
SimpleExcel.php
author
Alan Knowles
<alan@roojs.com>
Fri, 12 Sep 2014 05:25:39 +0000
(13:25 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 12 Sep 2014 05:25:39 +0000
(13:25 +0800)
SimpleExcel.php
patch
|
blob
|
history
diff --git
a/SimpleExcel.php
b/SimpleExcel.php
index
e3a4cd2
..
8d1db39
100644
(file)
--- 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']]);