Merge remote-tracking branch 'origin/MAGETWO-64716' into BUGS

Author: sevos1984

app/code/Magento/Catalog/Setup/UpgradeData.php

@@ -49,6 +49,8 @@ public function __construct(CategorySetupFactory $categorySetupFactory, EavSetup
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -360,9 +362,36 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             $this->changePriceAttributeDefaultScope($categorySetup);
         }
 
+        if (version_compare($context->getVersion(), '2.1.5') < 0) {
+            $this->dissallowUsingHtmlForProductName($setup);
+        }
+
         $setup->endSetup();
     }
 
+    /**
+     * Set to 'No' 'Is Allowed Html on Store Front' option on product name attribute, because product name
+     * is multi entity field (used in order, quote) and cannot be conditionally escaped in all places
+     *
+     * @param ModuleDataSetupInterface $categorySetup
+     * @return void
+     */
+    private function dissallowUsingHtmlForProductName(ModuleDataSetupInterface $setup)
+    {
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
+        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
+        $attribute = $categorySetup->getAttribute($entityTypeId, 'name');
+
+        $setup->getConnection()
+            ->update(
+                $setup->getTable('catalog_eav_attribute'),
+                ['is_html_allowed_on_front' => 0],
+                $setup->getConnection()->quoteInto('attribute_id = ?', $attribute['attribute_id'])
+            );
+
+    }
+
     /**
      * @param \Magento\Catalog\Setup\CategorySetup $categorySetup
      * @return void

app/code/Magento/Catalog/etc/eav_attributes.xml

@@ -29,6 +29,9 @@
         <attribute code="price_type">
             <field code="is_searchable" locked="true" />
         </attribute>
+        <attribute code="name">
+            <field code="is_html_allowed_on_front" locked="true"/>
+        </attribute>
         <attribute code="category_ids">
             <field code="is_global" locked="true" />
             <field code="is_searchable" locked="true" />

app/code/Magento/Catalog/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Catalog" setup_version="2.1.4">
+    <module name="Magento_Catalog" setup_version="2.1.5">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Cms"/>

lib/web/mage/adminhtml/form.js

@@ -488,8 +488,13 @@ define([
 
                     if (isAnInputOrSelect && !isInheritCheckboxChecked) {
                         if (target) {
-                            target.disabled = false;
+                            if (target.getAttribute('readonly')) {
+                                target.disabled = true;
+                            } else {
+                                target.disabled = false;
+                            }
                         }
+
                         jQuery('#' + idTo).removeClass('ignore-validate');
                     }
                 }