mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-12 17:54:44 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#966

Browse Source
This commit is contained in:
Ryan Cramer
2021-04-19 12:37:55 -04:00
parent 8644ab7b57
commit e15efa9273
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/modules/Fieldtype/FieldtypeDatetime.module
View File

@@ -378,12 +378,12 @@ class FieldtypeDatetime extends Fieldtype {
$f->icon = 'calendar'; $f->icon = 'calendar';
$f->addOption('', $this->_('None')); $f->addOption('', $this->_('None'));
$f->columnWidth = 50; $f->columnWidth = 50;
$date = strtotime('2016-04-08 5:10:02 PM'); $date = strlen(date('jn')) < 4 ? time() : strtotime('2016-04-08 5:10:02 PM');
$found = false; $found = false;
foreach($wdt->getDateFormats() as $format) { foreach($wdt->getDateFormats() as $format) {
$dateFormatted = $wdt->formatDate($date, $format); $dateFormatted = $wdt->formatDate($date, $format);
if($format == 'U') $dateFormatted .= " " . $this->_('(unix timestamp)'); if($format == 'U') $dateFormatted .= " " . $this->_('(unix timestamp)');
$f->addOption($format, $dateFormatted); $f->addOption($format, "$dateFormatted [$format]");
if(!$found && strpos($field->get('dateOutputFormat'), $format) !== false) { if(!$found && strpos($field->get('dateOutputFormat'), $format) !== false) {
$f->attr('value', $format); $f->attr('value', $format);
$found = true; $found = true;
@@ -403,7 +403,7 @@ class FieldtypeDatetime extends Fieldtype {
$dateOutputFormat = $field->get('dateOutputFormat'); $dateOutputFormat = $field->get('dateOutputFormat');
foreach($wdt->getTimeFormats() as $format) { foreach($wdt->getTimeFormats() as $format) {
$timeFormatted = $wdt->formatDate($date, $format); $timeFormatted = $wdt->formatDate($date, $format);
$f->addOption($format, $timeFormatted); $f->addOption($format, "$timeFormatted [$format]");
if(strpos($dateOutputFormat, $format) !== false) { if(strpos($dateOutputFormat, $format) !== false) {
list(,$test) = explode($format, $dateOutputFormat); list(,$test) = explode($format, $dateOutputFormat);
if(!strlen($test)) $f->attr('value', $format); if(!strlen($test)) $f->attr('value', $format);