From 57464cbf1ac31eb748d7a26321e605ebbaaa25e7 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Tue, 26 Jun 2012 20:55:27 +0100 Subject: [PATCH] Bugfix: Support for "e" (epoch) date format mask Rendered as a 4-digit CE year in non-Excel outputs --- Classes/PHPExcel/Shared/Date.php | 2 +- Classes/PHPExcel/Style/NumberFormat.php | 1 + changelog.txt | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Classes/PHPExcel/Shared/Date.php b/Classes/PHPExcel/Shared/Date.php index 656c357a..d7b8609d 100644 --- a/Classes/PHPExcel/Shared/Date.php +++ b/Classes/PHPExcel/Shared/Date.php @@ -253,7 +253,7 @@ class PHPExcel_Shared_Date } // function isDateTimeFormat() - private static $possibleDateFormatCharacters = 'ymdHs'; + private static $possibleDateFormatCharacters = 'eymdHs'; /** * Is a given number format code a date/time? diff --git a/Classes/PHPExcel/Style/NumberFormat.php b/Classes/PHPExcel/Style/NumberFormat.php index 783cf359..1b57959e 100644 --- a/Classes/PHPExcel/Style/NumberFormat.php +++ b/Classes/PHPExcel/Style/NumberFormat.php @@ -460,6 +460,7 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable // 12-hour suffix 'am/pm' => 'A', // 4-digit year + 'e' => 'Y', 'yyyy' => 'Y', // 2-digit year 'yy' => 'y', diff --git a/changelog.txt b/changelog.txt index 582dfb5d..ed79edc9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -31,7 +31,8 @@ Fixed in SVN: - Feature: (MBaker) Initial version of HTML Reader - Bugfix: (cyberconte) Patch 12318 - OOCalc cells containing inside the tag - Bugfix: (schir1964) Fix to listWorksheetInfo() method for OOCalc Reader - +- Bugfix: (MBaker) Support for "e" (epoch) date format mask + Rendered as a 4-digit CE year in non-Excel outputs 2012-05-19 (v1.7.7): - Bugfix: (Progi1984) Work item 8916 - Support for Rich-Text in PHPExcel_Writer_Excel5