Merge pull request #1434 from magento-helix/MAGETWO-71707

Fixed issues:
MAGETWO-71707: Merge release branch into 2.1-develop

Author: Sergii Kovalenko

CHANGELOG.md

@@ -32,6 +32,79 @@
     * [#10188](https://github.com/magento/magento2/pull/10188) -- magento/magento2:#6175 Fixed Unable to generate unsecure URL if current URL is secure (by @arshadpkm)
     * [#10260](https://github.com/magento/magento2/pull/10260) -- Fix order date format in Orders Grid (by @ihor-sviziev)
     * [#10282](https://github.com/magento/magento2/pull/10282) -- 2.1 - Allow to use text swatch 0 (by @ihor-sviziev)
+    
+2.1.8
+=============
+* GitHub issues:
+    * [#5627](https://github.com/magento/magento2/issues/5627) -- main.CRITICAL: Broken reference (Magento CE v2.1) (fixed in [#9092](https://github.com/magento/magento2/pull/9092))
+    * [#4232](https://github.com/magento/magento2/issues/4232) -- UTF-8 special character issue in widgets (fixed in [#9333](https://github.com/magento/magento2/pull/9333))
+    * [#4427](https://github.com/magento/magento2/issues/4427) -- SEO/HEAD - Meta title is null when breadcrumb section is removed via XML (fixed in [#9324](https://github.com/magento/magento2/pull/9324))
+    * [#4868](https://github.com/magento/magento2/issues/4868) -- Checkout page very large and quite slow. (fixed in [#9364](https://github.com/magento/magento2/pull/9364) and [#9365](https://github.com/magento/magento2/pull/9365))
+    * [#6997](https://github.com/magento/magento2/issues/6997) -- Remove unneeded region definitions from the /checkout page. (fixed in [#9364](https://github.com/magento/magento2/pull/9364))
+    * [#6451](https://github.com/magento/magento2/issues/6451) -- Login Popup broken on iPad portrait (fixed in [#9396](https://github.com/magento/magento2/pull/9396))
+    * [#7497](https://github.com/magento/magento2/issues/7497) -- Shipping method radios become disabled when checkout page refreshed (fixed in [#9485](https://github.com/magento/magento2/pull/9485))
+    * [#4828](https://github.com/magento/magento2/issues/4828) -- Show/hide Editor not working sometimes (fixed in [#9499](https://github.com/magento/magento2/pull/9499))
+    * [#6222](https://github.com/magento/magento2/issues/6222) -- [2.1.0] Sometimes WYSIWYG editor does not show. (fixed in [#9499](https://github.com/magento/magento2/pull/9499))
+    * [#6815](https://github.com/magento/magento2/issues/6815) -- wysiwyg Editor problem (fixed in [#9499](https://github.com/magento/magento2/pull/9499))
+    * [#6866](https://github.com/magento/magento2/issues/6866) -- Products in wishlist show $0.00 price (fixed in [#9571](https://github.com/magento/magento2/pull/9571))
+    * [#8607](https://github.com/magento/magento2/issues/8607) -- Interface constructor if present will break Magento compilation (fixed in [#9524](https://github.com/magento/magento2/pull/9524))
+    * [#5352](https://github.com/magento/magento2/issues/5352) -- Magento 2.1 email logo image function does not work (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#5916](https://github.com/magento/magento2/issues/5916) -- Magento 2.1 transactional email uploaded logo not showing in admin. (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#5633](https://github.com/magento/magento2/issues/5633) -- Magento 2.1 fails to load email_logo.png (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#6420](https://github.com/magento/magento2/issues/6420) -- New order email header logo not showing correctly v2.1 (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#6275](https://github.com/magento/magento2/issues/6275) -- Transactional Email Logo Not Getting Updated (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#6502](https://github.com/magento/magento2/issues/6502) -- Can't save Logo Image to Transactional Emails (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#7985](https://github.com/magento/magento2/issues/7985) -- Logo email (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#7853](https://github.com/magento/magento2/issues/7853) -- Transactional email logo wrong location (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#8728](https://github.com/magento/magento2/issues/8728) -- Transactional Emails Logo (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#8626](https://github.com/magento/magento2/issues/8626) -- Magento 2.1.2 - 2.1.4 email logo image function does not work (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#8489](https://github.com/magento/magento2/issues/8489) -- Magento 2.1.4 - Asking Why Email Logo Never been fixed on all Magento releases (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#8961](https://github.com/magento/magento2/issues/8961) -- email logo error (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#9118](https://github.com/magento/magento2/issues/9118) -- transactional email (fixed in [#9590](https://github.com/magento/magento2/pull/9590))
+    * [#9428](https://github.com/magento/magento2/issues/9428) -- 2.1.6 Receive 500 error when want export Low Stock Report. (fixed in [#9487](https://github.com/magento/magento2/pull/9487))
+    * [#3640](https://github.com/magento/magento2/issues/3640) -- CartItemInterface cannot add extension_attributes (fixed in [#9647](https://github.com/magento/magento2/pull/9647))
+    * [#9646](https://github.com/magento/magento2/issues/9646) -- CartTotalRepository cannot handle extension attributes in quote addresses (fixed in [#9647](https://github.com/magento/magento2/pull/9647))
+    * [#700](https://github.com/magento/magento2/issues/700) -- suggestion: revise WYSIWYG editor (fixed in [#9655](https://github.com/magento/magento2/pull/9655))
+    * [#2312](https://github.com/magento/magento2/issues/2312) -- Media Browser loses PNG transparency for the thumbnails (fixed in [#9662](https://github.com/magento/magento2/pull/9662))
+    * [#5401](https://github.com/magento/magento2/issues/5401) -- Transparency of .png image gone (fixed in [#9662](https://github.com/magento/magento2/pull/9662))
+    * [#7149](https://github.com/magento/magento2/issues/7149) -- Admin WYSIWYG upgrade to latest Tiny MCE 4.* (fixed in [#9655](https://github.com/magento/magento2/pull/9655))
+    * [#8874](https://github.com/magento/magento2/issues/8874) -- tinyMCE is disabled (fixed in [#9655](https://github.com/magento/magento2/pull/9655))
+    * [#9518](https://github.com/magento/magento2/issues/9518) -- Chrome version 58 causes problems with selections in the tinymce editor (fixed in [#9655](https://github.com/magento/magento2/pull/9655))
+    * [#7959](https://github.com/magento/magento2/issues/7959) -- JS error on product page Cannot read property 'oldPrice' of undefined (fixed in [#9776](https://github.com/magento/magento2/pull/9776))
+    * [#9679](https://github.com/magento/magento2/issues/9679) -- Translation for layered navigation attribute option not working (fixed in [#9704](https://github.com/magento/magento2/pull/9704))
+    * [#6746](https://github.com/magento/magento2/issues/6746) -- Magento 2.1.1 Problem with change currency (fixed in [#9841](https://github.com/magento/magento2/pull/9841))
+    * [#9562](https://github.com/magento/magento2/issues/9562) -- ItemZone on product detail is not set correctly when chaning products via related/upsell products list (fixed in [#9841](https://github.com/magento/magento2/pull/9841))
+    * [#7279](https://github.com/magento/magento2/issues/7279) -- Bill-to Name and Ship-to Name trancated to 20 characters in backend (fixed in [#10011](https://github.com/magento/magento2/pull/10011))
+    * [#9139](https://github.com/magento/magento2/issues/9139) -- Unable to set negative product's quantity (fixed in [#9770](https://github.com/magento/magento2/pull/9770))
+* GitHub pull requests:
+    * [#9092](https://github.com/magento/magento2/pull/9092) -- Issue #5627: main.CRITICAL: Broken reference (Magento CE v2.1) (by @malachy-mcconnnell)
+    * [#8880](https://github.com/magento/magento2/pull/8880) -- Update design_config_form.xml (by @WaPoNe)
+    * [#9332](https://github.com/magento/magento2/pull/9332) -- Backport of MAGETWO-54401 for Magento 2.1 - Unable to click "Insert image" twice (by @hostep)
+    * [#9333](https://github.com/magento/magento2/pull/9333) -- Backport of MAGETWO-52850 for Magento 2.1 - [GitHub] UTF-8 special character issue in widgets #4232 (by @hostep)
+    * [#9324](https://github.com/magento/magento2/pull/9324) -- Page meta title fix in case breadcrumb section is removed via XML (by @latenights)
+    * [#9364](https://github.com/magento/magento2/pull/9364) -- Backport of MAGETWO-59685 for Magento 2.1 - Checkout pages very slow … (by @hostep)
+    * [#9376](https://github.com/magento/magento2/pull/9376) -- Fix a bug resulting in incorrect offsets with dynamic row drag-n-drop functionality (by @navarr)
+    * [#9365](https://github.com/magento/magento2/pull/9365) -- Backport of MAGETWO-60351 for Magento 2.1 - Unnecessary disabled paym… (by @hostep)
+    * [#9396](https://github.com/magento/magento2/pull/9396) -- [2.1-backport] Fix Login Popup broken on iPad portrait (by @ihor-sviziev)
+    * [#9485](https://github.com/magento/magento2/pull/9485) -- Shipping method radios become disabled when checkout page refreshed (by @rachkulik)
+    * [#9500](https://github.com/magento/magento2/pull/9500) -- Backport of MAGETWO-54798 For Magento 2.1: One page checkout - Street Address should highlight red when data is missing (by @hostep)
+    * [#9499](https://github.com/magento/magento2/pull/9499) -- Backport of MAGETWO-57675 for Magento 2.1: WYSIWYG editor does not show. #6222 #4828 #6815 (by @hostep)
+    * [#9571](https://github.com/magento/magento2/pull/9571) -- Backport of MAGETWO-59512 for Magento 2.1: Products in wishlist show $0.00 price #6866 (by @hostep)
+    * [#9524](https://github.com/magento/magento2/pull/9524) -- magento/magento2#8607: Interface constructor if present will break Magento compilation (by @LoganayakiK)
+    * [#9590](https://github.com/magento/magento2/pull/9590) -- Backport of MAGETWO-53010 for Magento 2.1: Saving a custom transactional email logo, failed. (by @hostep)
+    * [#9487](https://github.com/magento/magento2/pull/9487) -- magento/magento2#9428: 2.1.6 Fixed 500 error while getting Low Stock Reports (by @mikebox)
+    * [#9653](https://github.com/magento/magento2/pull/9653) -- Allow X-Forwarded-For to have multiple values [2.1 backport] (by @kassner)
+    * [#9647](https://github.com/magento/magento2/pull/9647) -- Fix for #9646 (by @ekuusela)
+    * [#9662](https://github.com/magento/magento2/pull/9662) -- Keep transparency when resizing images [2.1 backport] (by @kassner)
+    * [#9661](https://github.com/magento/magento2/pull/9661) -- Add configurations for change email templates [2.1 backport] (by @kassner)
+    * [#9660](https://github.com/magento/magento2/pull/9660) -- Do not di:compile tests/ folder [2.1 backport] (by @kassner)
+    * [#9655](https://github.com/magento/magento2/pull/9655) -- Backport of MAGETWO-69152: Removed workaround for old Webkit bug in t… (by @hostep)
+    * [#9776](https://github.com/magento/magento2/pull/9776) -- #7959 - Fix for JS error on Swatch Renderer for undefined oldPrice (by @dreamworkers)
+    * [#9601](https://github.com/magento/magento2/pull/9601) -- Do not hardcode product link types [2.1 backport] (by @kassner)
+    * [#9704](https://github.com/magento/magento2/pull/9704) -- Fixes regression bug introduced in Magento 2.1.6 where the layered navigation options are sometimes being cached using the wrong store id. (by @hostep)
+    * [#9841](https://github.com/magento/magento2/pull/9841) -- Backport of MAGETWO-59089 for Magento 2.1: Magento 2.1.1 Problem with change currency (by @hostep)
+    * [#10011](https://github.com/magento/magento2/pull/10011) -- Backport 7279 to 2.1 (by @lazyguru)
+    * [#9770](https://github.com/magento/magento2/pull/9770) -- #9139 Unable to set negative product's quantity fixes commit. (by @poongud)
 
 2.1.1
 =============

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -542,19 +542,24 @@ protected function retrieveOldSkus()
      */
     protected function processCountExistingPrices($prices, $table)
     {
+        $oldSkus = $this->retrieveOldSkus();
+        $existProductIds = array_intersect_key($oldSkus, $prices);
+        if (!count($existProductIds)) {
+            return $this;
+        }
+
         $tableName = $this->_resourceFactory->create()->getTable($table);
         $productEntityLinkField = $this->getProductEntityLinkField();
         $existingPrices = $this->_connection->fetchAssoc(
             $this->_connection->select()->from(
                 $tableName,
                 ['value_id', $productEntityLinkField, 'all_groups', 'customer_group_id']
-            )
+            )->where($productEntityLinkField . ' IN (?)', $existProductIds)
         );
-        $oldSkus = $this->retrieveOldSkus();
         foreach ($existingPrices as $existingPrice) {
-            foreach ($oldSkus as $sku => $productId) {
-                if ($existingPrice[$productEntityLinkField] == $productId && isset($prices[$sku])) {
-                    $this->incrementCounterUpdated($prices[$sku], $existingPrice);
+            foreach ($prices as $sku => $skuPrices) {
+                if (isset($oldSkus[$sku]) && $existingPrice[$productEntityLinkField] == $oldSkus[$sku]) {
+                    $this->incrementCounterUpdated($skuPrices, $existingPrice);
                 }
             }
         }

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.2",
+    "version": "100.1.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php

@@ -14,6 +14,12 @@
 use Magento\Backend\Block\Widget\Form;
 use Magento\Backend\Block\Widget\Form\Generic;
 
+/**
+ * Class Content
+ *
+ * @deprecated
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav
+ */
 class Content extends Generic
 {
     /**

app/code/Magento/Catalog/Block/Product/View/Attributes.php

@@ -15,6 +15,9 @@
 use Magento\Framework\Phrase;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
+/**
+ * Product attributes block.
+ */
 class Attributes extends \Magento\Framework\View\Element\Template
 {
     /**
@@ -59,6 +62,7 @@ public function getProduct()
         if (!$this->_product) {
             $this->_product = $this->_coreRegistry->registry('product');
         }
+
         return $this->_product;
     }
 
@@ -96,6 +100,7 @@ public function getAdditionalData(array $excludeAttr = [])
                 }
             }
         }
+
         return $data;
     }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Category.php

@@ -31,16 +31,16 @@ abstract class Category extends \Magento\Backend\App\Action
      */
     protected function _initCategory($getRootInstead = false)
     {
-        $categoryId = (int)$this->getRequest()->getParam('id', false);
+        $categoryId = $this->resolveCategoryId();
         $storeId = (int)$this->getRequest()->getParam('store');
-        $category = $this->_objectManager->create('Magento\Catalog\Model\Category');
+        $category = $this->_objectManager->create(\Magento\Catalog\Model\Category::class);
         $category->setStoreId($storeId);
 
         if ($categoryId) {
             $category->load($categoryId);
             if ($storeId) {
                 $rootId = $this->_objectManager->get(
-                    'Magento\Store\Model\StoreManagerInterface'
+                    \Magento\Store\Model\StoreManagerInterface::class
                 )->getStore(
                     $storeId
                 )->getRootCategoryId();
@@ -55,13 +55,25 @@ protected function _initCategory($getRootInstead = false)
             }
         }
 
-        $this->_objectManager->get('Magento\Framework\Registry')->register('category', $category);
-        $this->_objectManager->get('Magento\Framework\Registry')->register('current_category', $category);
-        $this->_objectManager->get('Magento\Cms\Model\Wysiwyg\Config')
+        $this->_objectManager->get(\Magento\Framework\Registry::class)->register('category', $category);
+        $this->_objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
+        $this->_objectManager->get(\Magento\Cms\Model\Wysiwyg\Config::class)
             ->setStoreId($this->getRequest()->getParam('store'));
         return $category;
     }
 
+    /**
+     * Resolve Category Id (from get or from post).
+     *
+     * @return int
+     */
+    private function resolveCategoryId()
+    {
+        $categoryId = (int)$this->getRequest()->getParam('id', false);
+
+        return $categoryId ?: (int)$this->getRequest()->getParam('entity_id', false);
+    }
+
     /**
      * Build response for ajax request
      *
@@ -79,7 +91,7 @@ protected function ajaxRequestResponse($category, $resultPage)
         if (empty($breadcrumbsPath)) {
             // but if no category, and it is deleted - prepare breadcrumbs from path, saved in session
             $breadcrumbsPath = $this->_objectManager->get(
-                'Magento\Backend\Model\Auth\Session'
+                \Magento\Backend\Model\Auth\Session::class
             )->getDeletedPath(
                 true
             );
@@ -107,7 +119,7 @@ protected function ajaxRequestResponse($category, $resultPage)
             ['response' => $eventResponse, 'controller' => $this]
         );
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-        $resultJson = $this->_objectManager->get('Magento\Framework\Controller\Result\Json');
+        $resultJson = $this->_objectManager->get(\Magento\Framework\Controller\Result\Json::class);
         $resultJson->setHeader('Content-type', 'application/json', true);
         $resultJson->setData($eventResponse->getData());
         return $resultJson;

app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php

@@ -44,14 +44,15 @@ protected function _isAllowed()
     }
 
     /**
-     * Upload file controller action
+     * Upload file controller action.
      *
      * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
+        $imageId = $this->_request->getParam('param_name', 'image');
         try {
-            $result = $this->imageUploader->saveFileToTmpDir('image');
+            $result = $this->imageUploader->saveFileToTmpDir($imageId);
 
             $result['cookie'] = [
                 'name' => $this->_getSession()->getName(),