tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix Date and SS_DateTime::FormatFromSettings

Browse Source 
This issue is caused by the odd default behaviour of Zend_Date, which attempts to parse yyyy-mm-dd format date and times as though they were yyyy-dd-mm.
This commit is contained in:
Damian Mooyman 2014-04-01 17:03:10 +13:00
parent b22aaaab1f
commit 05e4d1af71
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/fieldtypes/Date.php
View File

@ -169,7 +169,7 @@ class Date extends DBField {
} }
$formatD = $member->getDateFormat(); $formatD = $member->getDateFormat();
$zendDate = new Zend_Date($this->getValue()); $zendDate = new Zend_Date($this->getValue(), 'y-MM-dd');
return $zendDate->toString($formatD); return $zendDate->toString($formatD);
} }

2
model/fieldtypes/Datetime.php
View File

@ -112,7 +112,7 @@ class SS_Datetime extends Date implements TemplateGlobalProvider {
$formatD = $member->getDateFormat(); $formatD = $member->getDateFormat();
$formatT = $member->getTimeFormat(); $formatT = $member->getTimeFormat();
$zendDate = new Zend_Date($this->getValue()); $zendDate = new Zend_Date($this->getValue(), 'y-MM-dd HH:mm:ss');
return $zendDate->toString($formatD).' '.$zendDate->toString($formatT); return $zendDate->toString($formatD).' '.$zendDate->toString($formatT);
} }

3
tests/model/DateTest.php
View File

@ -212,7 +212,8 @@ class DateTest extends SapphireTest {
$fixtures = array( $fixtures = array(
'2000-12-31' => '31/12/2000', '2000-12-31' => '31/12/2000',
'31-12-2000' => '31/12/2000', '31-12-2000' => '31/12/2000',
'31/12/2000' => '31/12/2000' '31/12/2000' => '31/12/2000',
'2014-04-01' => '01/04/2014'
); );
foreach($fixtures as $from => $to) { foreach($fixtures as $from => $to) {

3
tests/model/DatetimeTest.php
View File

@ -162,11 +162,12 @@ class SS_DatetimeTest extends SapphireTest {
'2000-12-31 1:11:01' => '31/12/2000 01:11:01', '2000-12-31 1:11:01' => '31/12/2000 01:11:01',
'12/12/2000 1:11:01' => '12/12/2000 01:11:01', '12/12/2000 1:11:01' => '12/12/2000 01:11:01',
'2000-12-31' => '31/12/2000 12:00:00', '2000-12-31' => '31/12/2000 12:00:00',
'2014-04-01 10:11:01' => '01/04/2014 10:11:01',
'10:11:01' => date('d/m/Y').' 10:11:01' '10:11:01' => date('d/m/Y').' 10:11:01'
); );
foreach($fixtures as $from => $to) { foreach($fixtures as $from => $to) {
$date = DBField::create_field('Datetime', $from); $date = DBField::create_field('SS_Datetime', $from);
// With member // With member
$this->assertEquals($to, $date->FormatFromSettings($member)); $this->assertEquals($to, $date->FormatFromSettings($member));
// Without member // Without member