Merge pull request #916 from magento-engcom/develop-prs

Merged Pull Requests: #2199 #6767 #5620
magento · Mar 12, 2017 · ca2c833 · ca2c833
2 parents 65d8a67 + bbd43bd
commit ca2c833
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php
@@ -37,7 +37,7 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->setActiveMenu('Magento_Catalog::catalog_products');
-        $resultPage->getConfig()->getTitle()->prepend(__('Catalog'));
+        $resultPage->getConfig()->getTitle()->prepend(__('Products'));
         return $resultPage;
     }
 }
diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
@@ -7,8 +7,8 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_Catalog::catalog" title="Products" translate="title" module="Magento_Catalog" sortOrder="20" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
-        <add id="Magento_Catalog::catalog_products" title="Catalog" translate="title" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::inventory" action="catalog/product/" resource="Magento_Catalog::products"/>
+        <add id="Magento_Catalog::catalog" title="Catalog" translate="title" module="Magento_Catalog" sortOrder="20" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
+        <add id="Magento_Catalog::catalog_products" title="Products" translate="title" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::inventory" action="catalog/product/" resource="Magento_Catalog::products"/>
         <add id="Magento_Catalog::catalog_categories" title="Categories" translate="title" module="Magento_Catalog" sortOrder="20" parent="Magento_Catalog::inventory" action="catalog/category/" resource="Magento_Catalog::categories"/>
         <add id="Magento_Catalog::catalog_attributes_attributes" title="Product" translate="title" module="Magento_Catalog" sortOrder="30" parent="Magento_Backend::stores_attributes" action="catalog/product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
         <add id="Magento_Catalog::catalog_attributes_sets" title="Attribute Set" translate="title" module="Magento_Catalog" sortOrder="40" parent="Magento_Backend::stores_attributes" action="catalog/product_set/" resource="Magento_Catalog::sets"/>

diff --git a/lib/internal/Magento/Framework/App/RouterList.php b/lib/internal/Magento/Framework/App/RouterList.php
@@ -29,7 +29,6 @@ class RouterList implements RouterListInterface
     public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $routerList)
     {
         $this->objectManager = $objectManager;
-        $this->routerList = $routerList;
         $this->routerList = array_filter(
             $routerList,
             function ($item) {

diff --git a/lib/internal/Magento/Framework/EntityManager/Db/ReadRow.php b/lib/internal/Magento/Framework/EntityManager/Db/ReadRow.php
@@ -49,7 +49,6 @@ public function execute($entityType, $identifier, $context = [])
     {
         $metadata = $this->metadataPool->getMetadata($entityType);
         $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
-        $metadata = $this->metadataPool->getMetadata($entityType);
         $select = $connection->select()
             ->from(['t' => $metadata->getEntityTable()])
             ->where($metadata->getIdentifierField() . ' = ?', $identifier);