Merge pull request #1110 from magento-engcom/2.1-develop-prs

Public Pull Requests: - #9653 - #9487
magento · May 17, 2017 · 84675bb · 84675bb
2 parents c605e5d + 98dfbf0
commit 84675bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml
@@ -8,6 +8,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="reports_report_product_lowstock_grid"/>
     <body>
-        <container name="adminhtml.block.report.product.lowstock.grid.container" label="Export CSV"/>
+        <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
     </body>
 </page>
diff --git a/...code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml b/...code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml
@@ -8,6 +8,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="reports_report_product_lowstock_grid"/>
     <body>
-        <container name="adminhtml.block.report.product.lowstock.grid.container" label="Excel XML"/>
+        <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
     </body>
 </page>
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -63,6 +63,11 @@ public function getRemoteAddress($ipToLong = false)
         if (!$this->remoteAddress) {
             return false;
         }
+
+        if (strpos($this->remoteAddress, ',') !== false) {
+            $ipList = explode(',', $this->remoteAddress);
+            $this->remoteAddress = trim(reset($ipList));
+        }
 
         return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
     }