Merge pull request #260 from magento-l3/AUG102023_PR_pradeep

internal-magento-queue-manager[bot] · web-flow · commit 2016d430a890 · 2023-09-19T02:23:05.000Z
[L3 Kings] Bugfix delivery
diff --git a/app/code/Magento/PageBuilder/etc/adminhtml/di.xml b/app/code/Magento/PageBuilder/etc/adminhtml/di.xml
@@ -641,9 +641,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav">
         <plugin name="pagebuilder_product_form_eav" type="Magento\PageBuilder\Plugin\Catalog\Ui\DataProvider\Product\Form\Modifier\EavPlugin" sortOrder="20"/>
     </type>
diff --git a/app/code/Magento/PageBuilder/etc/di.xml b/app/code/Magento/PageBuilder/etc/di.xml
@@ -316,6 +316,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Filter\Template">
+        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+    </type>
     <type name="Magento\PageBuilder\Model\UpgradableEntitiesPool">
         <arguments>
             <argument name="entities" xsi:type="array">
diff --git a/app/code/Magento/PageBuilder/etc/frontend/di.xml b/app/code/Magento/PageBuilder/etc/frontend/di.xml
@@ -12,7 +12,4 @@
     <type name="Magento\Email\Model\Template\Filter">
         <plugin name="escapeCustomVarDirectives" type="Magento\PageBuilder\Plugin\Filter\CustomVarTemplate"/>
     </type>
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
 </config>
diff --git a/app/code/Magento/PageBuilder/etc/graphql/di.xml b/app/code/Magento/PageBuilder/etc/graphql/di.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin" disabled="true"/>
     </type>
 </config>
diff --git a/app/code/Magento/PageBuilder/etc/webapi_rest/di.xml b/app/code/Magento/PageBuilder/etc/webapi_rest/di.xml
diff --git a/app/code/Magento/PageBuilder/etc/webapi_soap/di.xml b/app/code/Magento/PageBuilder/etc/webapi_soap/di.xml
