Merge remote-tracking branch 'upstream/develop' into MAGETWO-39769-pk-autoincrement

Author: Joan He

app/code/Magento/AdminNotification/i18n/zh_CN.csv renamed to app/code/Magento/AdminNotification/i18n/zh_Hans_CN.csv

@@ -84,6 +84,19 @@ protected function _prepareCollection()
         return parent::_prepareCollection();
     }
 
+    /**
+     * Process collection after loading
+     *
+     * @return $this
+     */
+    protected function _afterLoadCollection()
+    {
+        foreach ($this->getCollection() as $item) {
+            $item->getCustomer() ?: $item->setCustomer('Guest');
+        }
+        return $this;
+    }
+
     /**
      * Prepares page sizes for dashboard grid with las 5 orders
      *

app/code/Magento/Authorizenet/i18n/zh_CN.csv renamed to app/code/Magento/Authorizenet/i18n/zh_Hans_CN.csv

@@ -211,7 +211,7 @@ public function isWebsiteSelected(\Magento\Store\Model\Website $website)
     public function getWebsiteId()
     {
         if (!$this->hasData('website_id')) {
-            $this->setData('website_id', $this->getRequest()->getParam($this->getWebsiteVarName()));
+            $this->setData('website_id', (int)$this->getRequest()->getParam($this->getWebsiteVarName()));
         }
         return $this->getData('website_id');
     }
@@ -289,7 +289,7 @@ public function isStoreGroupSelected(\Magento\Store\Model\Group $group)
     public function getStoreGroupId()
     {
         if (!$this->hasData('store_group_id')) {
-            $this->setData('store_group_id', $this->getRequest()->getParam($this->getStoreGroupVarName()));
+            $this->setData('store_group_id', (int)$this->getRequest()->getParam($this->getStoreGroupVarName()));
         }
         return $this->getData('store_group_id');
     }
@@ -339,7 +339,7 @@ public function getStores($group)
     public function getStoreId()
     {
         if (!$this->hasData('store_id')) {
-            $this->setData('store_id', $this->getRequest()->getParam($this->getStoreVarName()));
+            $this->setData('store_id', (int)$this->getRequest()->getParam($this->getStoreVarName()));
         }
         return $this->getData('store_id');
     }

app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php

@@ -174,7 +174,7 @@ require(['jquery'], function(jQuery){
             if (confirm("<?php /* @escapeNotVerified */ echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>")) {
                 reload();
             } else {
-                obj.value = '<?php /* @escapeNotVerified */ echo $block->getStoreId() ?>';
+                obj.value = '<?php echo $block->escapeHtml($block->getStoreId()) ?>';
             }
             <?php else: ?>
                 reload();

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -33,4 +33,11 @@ public function getTree($rootCategoryId = null, $depth = null);
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function move($categoryId, $parentId, $afterId = null);
+
+    /**
+     * Provide the number of category count
+     *
+     * @return int
+     */
+    public function getCount();
 }