MAGETWO-63986: Merge branch 'fix-date-form-filter' of github.com:lazyguru/magento2 into MAGETWO-63986

ishakhsuvarov · ishakhsuvarov · commit 52125489e5c7 · 2017-02-01T12:33:11.000+02:00
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -242,7 +242,7 @@ protected function _getFormFilter()
         if ($filterCode) {
             $filterClass = 'Magento\Framework\Data\Form\Filter\\' . ucfirst($filterCode);
             if ($filterCode == 'date') {
-                $filter = new $filterClass($this->_dateFilterFormat(), $this->_localeResolver->getLocale());
+                $filter = new $filterClass($this->_dateFilterFormat(), $this->_localeResolver);
             } else {
                 $filter = new $filterClass();
             }

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ protected function _getFormFilter()`
`242`	`242`	`if ($filterCode) {`
`243`	`243`	`$filterClass = 'Magento\Framework\Data\Form\Filter\\' . ucfirst($filterCode);`
`244`	`244`	`if ($filterCode == 'date') {`
`245`		`- $filter = new $filterClass($this->_dateFilterFormat(), $this->_localeResolver->getLocale());`
	`245`	`+ $filter = new $filterClass($this->_dateFilterFormat(), $this->_localeResolver);`
`246`	`246`	`} else {`
`247`	`247`	`$filter = new $filterClass();`
`248`	`248`	`}`