Skip to content

Commit 2abc5a3

Browse files
committed
Merge pull request #500 from magento-troll/bugfixes
[Troll] Bugfixes
2 parents 6ea7d2d + 5ca736b commit 2abc5a3

File tree

2 files changed

+11
-2
lines changed
  • app/code/Magento/Eav/Model/Entity
  • lib/internal/Magento/Framework/Stdlib/DateTime/Filter

2 files changed

+11
-2
lines changed

app/code/Magento/Eav/Model/Entity/Type.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,11 @@ public function getEntityIdField()
278278
*/
279279
public function getEntityTable()
280280
{
281-
return isset($this->_data['entity_table']) ? $this->_data['entity_table'] : null;
281+
if (isset($this->_data['entity_table'])) {
282+
return $this->getResource()->getTable($this->_data['entity_table']);
283+
}
284+
285+
return null;
282286
}
283287

284288
/**

lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ public function __construct(TimezoneInterface $localeDate)
5252
*/
5353
public function filter($value)
5454
{
55-
return $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
55+
$value = $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
56+
57+
/**
58+
* @todo MAGETWO-51391
59+
*/
60+
return str_replace("\xc2\xa0", '', $value);
5661
}
5762
}

0 commit comments

Comments
 (0)