X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=SimpleExcel.php;h=3928a84a2f86fd9f264813eb7a8c2c9d12c4fe0e;hb=ef07772ae2edc7b3350f802bd17be363574ceee1;hp=6c36750ea2e301acfaab413f0d3bc9497c7b89a6;hpb=04ae6e8f7dd52b97fc5eef9dd6bdb90004b39125;p=Pman.Core

diff --git a/SimpleExcel.php b/SimpleExcel.php
index 6c36750e..3928a84a 100644
--- 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;