Skip to content

Commit 04ca5af

Browse files
fix integration test failure
1 parent fcdbfeb commit 04ca5af

File tree

1 file changed

+1
-1
lines changed
  • app/code/Magento/Catalog/Block/Product/View/Options/Type

1 file changed

+1
-1
lines changed

app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function getCalendarDateHtml()
9696
$fieldsSeparator = '/';
9797
$fieldsOrder = $this->_catalogProductOptionTypeDate->getConfigData('date_fields_order') ?? '';
9898
$fieldsOrder = str_replace(",", $fieldsSeparator, $fieldsOrder);
99-
$dateFormat = $fieldsOrder ?: $this->_localeDate->getDateFormatWithLongYear();
99+
$dateFormat = $fieldsOrder !== "m/d/y" ? $fieldsOrder : $this->_localeDate->getDateFormatWithLongYear();
100100
/** Escape RTL characters which are present in some locales and corrupt formatting */
101101
$escapedDateFormat = preg_replace('/[^MmDdYy\/\.\-]/', '', $dateFormat);
102102
$value = null;

0 commit comments

Comments
 (0)