projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04ae6e8
)
fix date type column
author
Alan
<alan@roojs.com>
Tue, 19 Jul 2022 06:59:39 +0000
(14:59 +0800)
committer
Alan
<alan@roojs.com>
Tue, 19 Jul 2022 06:59:39 +0000
(14:59 +0800)
SimpleExcel.php
patch
|
blob
|
history
diff --git
a/SimpleExcel.php
b/SimpleExcel.php
index
6c36750
..
3928a84
100644
(file)
--- a/
SimpleExcel.php
+++ b/
SimpleExcel.php
@@
-394,7
+394,7
@@
class Pman_Core_SimpleExcel extends Pman
// print_R(array($start_row+$r, $c, $v, $format));exit;
// handle 0 prefixes..
- if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $v)) {
+ if (
$dataFormat == 'date' ||
preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $v)) {
$dataFormat = 'date';
$format = empty($format) ? $this->formats['_default_date_format_']: $format;
$ut_to_ed_diff = 86400 * 25569;