projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
web
/
core
/
modules
/
datetime
/
src
/
Plugin
/
Field
/
FieldFormatter
/
DateTimePlainFormatter.php
diff --git
a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
index d35d3801da56b24f560cef656643705789e476d8..7f0dee2c31dda8d7d2ce335379fbb39f608df8b0 100644
(file)
--- a/
web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
+++ b/
web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
@@
-25,27
+25,12
@@
class DateTimePlainFormatter extends DateTimeFormatterBase {
$elements = [];
foreach ($items as $delta => $item) {
$elements = [];
foreach ($items as $delta => $item) {
- $output = '';
if (!empty($item->date)) {
/** @var \Drupal\Core\Datetime\DrupalDateTime $date */
$date = $item->date;
if (!empty($item->date)) {
/** @var \Drupal\Core\Datetime\DrupalDateTime $date */
$date = $item->date;
- if ($this->getFieldSetting('datetime_type') == 'date') {
- // A date without time will pick up the current time, use the default.
- datetime_date_default_time($date);
- }
- $this->setTimeZone($date);
-
- $output = $this->formatDate($date);
+ $elements[$delta] = $this->buildDate($date);
}
}
- $elements[$delta] = [
- '#cache' => [
- 'contexts' => [
- 'timezone',
- ],
- ],
- '#markup' => $output,
- ];
}
return $elements;
}
return $elements;