tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 12:49:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3002 from tractorcow/pulls/3.1-datetime-fix

Browse Source 
BUG Fix issue with SS_DateTime::FormatFromSettings failing to parse dates
This commit is contained in:
Mateusz U 2014-04-02 16:15:33 +13:00
commit 068e23d72f
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();
$zendDate = new Zend_Date($this->getValue());
$zendDate = new Zend_Date($this->getValue(), 'y-MM-dd');
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();
$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);
}

3
tests/model/DateTest.php
View File

@ -212,7 +212,8 @@ class DateTest extends SapphireTest {
$fixtures = array(
'2000-12-31' => '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) {

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',
'12/12/2000 1:11:01' => '12/12/2000 01:11:01',
'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'
);
foreach($fixtures as $from => $to) {
$date = DBField::create_field('Datetime', $from);
$date = DBField::create_field('SS_Datetime', $from);
// With member
$this->assertEquals($to, $date->FormatFromSettings($member));
// Without member