Merge branch 'MAGETWO-51252' of github.corp.magento.com:magento-troll/magento2ce into bugfixes

slopukhov · slopukhov · commit 0ffe2d862f3c · 2016-03-31T13:11:57.000+03:00
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -278,7 +278,11 @@ public function getEntityIdField()
      */
     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;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,11 @@ public function getEntityIdField()`
`278`	`278`	`*/`
`279`	`279`	`public function getEntityTable()`
`280`	`280`	`{`
`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;`
`282`	`286`	`}`
`283`	`287`
`284`	`288`	`/**`