Commit 112e955b authored by alexpott's avatar alexpott
Browse files

Revert "Issue #2457345 by vijaycs85: Remove unnecessary format lookup in...

Revert "Issue #2457345 by vijaycs85: Remove unnecessary format lookup in \Drupal\Core\Datetime\DateFormatter::dateFormat for 'custom' format"

This reverts commit 744514b9.
parent 69c9962c
...@@ -144,7 +144,7 @@ public function format($timestamp, $type = 'medium', $format = '', $timezone = N ...@@ -144,7 +144,7 @@ public function format($timestamp, $type = 'medium', $format = '', $timezone = N
$date = DrupalDateTime::createFromTimestamp($timestamp, $this->timezones[$timezone], $create_settings); $date = DrupalDateTime::createFromTimestamp($timestamp, $this->timezones[$timezone], $create_settings);
// If we have a non-custom date format use the provided date format pattern. // If we have a non-custom date format use the provided date format pattern.
if ($format !== 'custom' && $date_format = $this->dateFormat($type, $langcode)) { if ($date_format = $this->dateFormat($type, $langcode)) {
$format = $date_format->getPattern(); $format = $date_format->getPattern();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment