Skip to content
Snippets Groups Projects
Commit 91866853 authored by Sergey Semenov's avatar Sergey Semenov
Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-50758

parents ad06fee8 2abc5a35
No related merge requests found
......@@ -278,7 +278,11 @@ class Type extends \Magento\Framework\Model\AbstractModel
*/
public function getEntityTable()
{
return isset($this->_data['entity_table']) ? $this->_data['entity_table'] : null;
if (isset($this->_data['entity_table'])) {
return $this->getResource()->getTable($this->_data['entity_table']);
}
return null;
}
/**
......
......@@ -52,6 +52,11 @@ class Date implements \Zend_Filter_Interface
*/
public function filter($value)
{
return $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
$value = $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
/**
* @todo MAGETWO-51391
*/
return str_replace("\xc2\xa0", '', $value);
}
}
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