From 36985f6afa3a1aedeb522bb5def162ce17164b78 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:04:43 +0530 Subject: [PATCH 01/43] Update AssignProducts.php Declare module namespace before template path --- .../Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php index 69618f04eb2af..c718563d7576e 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php @@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template * * @var string */ - protected $_template = 'catalog/category/edit/assign_products.phtml'; + protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml'; /** * @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product From e057099ca89319e832fde7927ff7f623e4118610 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:07:37 +0530 Subject: [PATCH 02/43] Update DefaultCaptcha.php --- app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php index c0a091ca2d0d9..027c9a9085b47 100644 --- a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php +++ b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php @@ -13,7 +13,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'default.phtml'; + protected $_template = 'Magento_Captcha::default.phtml'; /** * @var string From 764637300eaae21e418aaa131232bae39be8ba66 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:08:52 +0530 Subject: [PATCH 03/43] Update Tree.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php index 12b468ee445aa..ed615b41644e2 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php @@ -29,7 +29,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory /** * @var string */ - protected $_template = 'catalog/category/tree.phtml'; + protected $_template = 'Magento_Catalog::catalog/category/tree.phtml'; /** * @var \Magento\Backend\Model\Auth\Session From 129011c4ba2d3584b225e7747e6cab647fc934bc Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:09:48 +0530 Subject: [PATCH 04/43] Update Chooser.php Declare module namespace before template path --- .../Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php index b5330ab66af71..9c83d4aea61c7 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php @@ -24,7 +24,7 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree * * @var string */ - protected $_template = 'catalog/category/widget/tree.phtml'; + protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml'; /** * @return void From 871a813b52203fd6f1e8168cf2f245765b38f03c Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:11:58 +0530 Subject: [PATCH 05/43] Update Edit.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php index c18106fe567d0..285caa974fd17 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php @@ -17,7 +17,7 @@ class Edit extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/edit.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit.phtml'; /** * Core registry From 8be7d67e02eeefff32763704baf2ec751520e2be Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:13:33 +0530 Subject: [PATCH 06/43] Update Main.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php index 6760b44c22ee1..1b188de40710f 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php @@ -22,7 +22,7 @@ class Main extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/main.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main.phtml'; /** * Core registry From efacfb4a3a694c3c8e48f328065e2c0c4f8b89cf Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:14:15 +0530 Subject: [PATCH 07/43] Update Group.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php index cf8de44c3d9df..93c2dcc76263c 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php @@ -14,5 +14,5 @@ class Group extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/group.phtml'; } From 7e26d02a253280e3dbf5a7e6d20a135f2eac78bf Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:15:01 +0530 Subject: [PATCH 08/43] Update Add.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php index 329afa968307c..f69e58985bfc5 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php @@ -18,7 +18,7 @@ class Add extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/add.phtml'; /** * @return AbstractBlock From 76de6381372727d14e8da6b1814caae71095d258 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:15:50 +0530 Subject: [PATCH 09/43] Update Main.php --- .../Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php index f707c5c340b68..e29ab26065dc3 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php @@ -20,7 +20,7 @@ class Main extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/main.phtml'; /** * @return $this From 78ad355464b0b35958fb65d78b95d91d7b948372 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:16:37 +0530 Subject: [PATCH 10/43] Update Configure.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Composite/Configure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php index 9270c1ac38ba3..98280d8d31237 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php @@ -22,7 +22,7 @@ class Configure extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/composite/configure.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/composite/configure.phtml'; /** * Core registry From 3bdb1ca5f51ed449b00af5c9090fb2d897228a4a Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:17:29 +0530 Subject: [PATCH 11/43] Update Alerts.php Declare module namespace before template path --- .../Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php index 4a3d7c4e14e30..d620cd5fee2b9 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php @@ -18,7 +18,7 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab /** * @var string */ - protected $_template = 'catalog/product/tab/alert.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/tab/alert.phtml'; /** * @return $this From a3c672dabe08033e7339229bafdd7c6bb13e6efe Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:18:13 +0530 Subject: [PATCH 12/43] Update Inventory.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php index e52c1d3aa4985..20e12889cae0d 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php @@ -15,7 +15,7 @@ class Inventory extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/tab/inventory.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/tab/inventory.phtml'; /** * @var \Magento\Framework\Module\Manager From 22c882636aa621ba7ede075ebfcf5c03f89d606a Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:18:50 +0530 Subject: [PATCH 13/43] Update Options.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php index a7a919e53f56e..2c79f5a6fa718 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php @@ -16,7 +16,7 @@ class Options extends Widget /** * @var string */ - protected $_template = 'catalog/product/edit/options.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options.phtml'; /** * @return Widget From 5c97366a45195d1501bb5f44a1ea151ed62d4d48 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:19:58 +0530 Subject: [PATCH 14/43] Update Websites.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php index 6a3347b44512f..6189a97dbe761 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php @@ -21,7 +21,7 @@ class Websites extends \Magento\Backend\Block\Store\Switcher /** * @var string */ - protected $_template = 'catalog/product/edit/websites.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/websites.phtml'; /** * Core registry From 06bcee3a6bb9a0bcd6e9a1a23d69b163ce5a5f42 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:20:34 +0530 Subject: [PATCH 15/43] Update Option.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php index 339239ea491e0..651d9a00095a3 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php @@ -38,7 +38,7 @@ class Option extends Widget /** * @var string */ - protected $_template = 'catalog/product/edit/options/option.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/option.phtml'; /** * Core registry From 255934c89c037aa5a591456a90c833c597793bbd Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:21:03 +0530 Subject: [PATCH 16/43] Update Date.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php index babfc1b072bd2..a0bbc4ad033de 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php @@ -16,5 +16,5 @@ class Date extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/date.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/date.phtml'; } From eb3ccbf00b04e0cf02aacdb7e5f77c43dafb21ec Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:21:34 +0530 Subject: [PATCH 17/43] Update File.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php index 322aa02f97731..d3d5f08fa9eae 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php @@ -16,5 +16,5 @@ class File extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/file.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/file.phtml'; } From 8b6d0f2e4541644b295ef0438d89a35912010dd2 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:22:52 +0530 Subject: [PATCH 18/43] Update Select.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php index 24de84958ef4a..f6ab5134ae6bd 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php @@ -16,7 +16,7 @@ class Select extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\T /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/select.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/select.phtml'; /** * Class constructor From 4697542606bea5ddce456326e808f0a0dbbda747 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:23:29 +0530 Subject: [PATCH 19/43] Update Text.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php index 7241128fac3b4..e6f78dc3ed169 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php @@ -16,5 +16,5 @@ class Text extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ /** * @var string */ - protected $_template = 'catalog/product/edit/options/type/text.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/text.phtml'; } From 5422414cd90313b500799109f3fe44f1007228a3 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:24:14 +0530 Subject: [PATCH 20/43] Update Tier.php Declare module namespace before template path --- .../Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php index a80ddd8c122a1..7cb1c2c9e4263 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php @@ -13,7 +13,7 @@ class Tier extends Group\AbstractGroup /** * @var string */ - protected $_template = 'catalog/product/edit/price/tier.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/edit/price/tier.phtml'; /** * Retrieve list of initial customer groups From 254a531619ccd9d18de93b21563516c76ded766a Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:24:51 +0530 Subject: [PATCH 21/43] Update Content.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Helper/Form/Gallery/Content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php index 7ad4befa60cb4..ac9e75493bdc3 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php @@ -23,7 +23,7 @@ class Content extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/helper/gallery.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/helper/gallery.phtml'; /** * @var \Magento\Catalog\Model\Product\Media\Config From cd81b614eb0acaa18efe88ba8c9544f539a55e86 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:25:22 +0530 Subject: [PATCH 22/43] Update Container.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Widget/Chooser/Container.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php index 19c1574d6e9a5..b8967f1f30e55 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php @@ -18,5 +18,5 @@ class Container extends Template /** * @var string */ - protected $_template = 'catalog/product/widget/chooser/container.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/widget/chooser/container.phtml'; } From 2b376856c04c49a55897fd5f8f597d0e0688cd2c Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:26:42 +0530 Subject: [PATCH 23/43] Update Link.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php index 9d13d89d54b80..a9ec80c5f0232 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php @@ -13,7 +13,7 @@ class Link extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'rss/grid/link.phtml'; + protected $_template = 'Magento_Catalog::rss/grid/link.phtml'; /** * @var \Magento\Framework\App\Rss\UrlBuilderInterface From ec05358612571228c03215b595e119f5676c40c5 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:27:23 +0530 Subject: [PATCH 24/43] Update Toolbar.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php index e9c383901b5ff..674b20a49c837 100644 --- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php +++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php @@ -83,7 +83,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'product/list/toolbar.phtml'; + protected $_template = 'Magento_Catalog::product/list/toolbar.phtml'; /** * Catalog config From 8e4db881653fd81d771f27365ca040efc56d00e8 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:27:53 +0530 Subject: [PATCH 25/43] Update Additional.php Declare module namespace before template path --- app/code/Magento/Catalog/Block/Product/View/Additional.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Product/View/Additional.php b/app/code/Magento/Catalog/Block/Product/View/Additional.php index 37c82c2bc84c8..66527985e41fd 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Additional.php +++ b/app/code/Magento/Catalog/Block/Product/View/Additional.php @@ -25,7 +25,7 @@ class Additional extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'product/view/additional.phtml'; + protected $_template = 'Magento_Catalog::product/view/additional.phtml'; /** * @return array From 3320653ff9d96741b3f2b9dc5e3a80eb26b9c688 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:28:51 +0530 Subject: [PATCH 26/43] Update Conditions.php Declare module namespace before template path --- .../Magento/CatalogWidget/Block/Product/Widget/Conditions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php index 04ae7c6a2d750..ab089f105ccd5 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php +++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php @@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface /** * @var string */ - protected $_template = 'product/widget/conditions.phtml'; + protected $_template = 'Magento_Catalog::product/widget/conditions.phtml'; /** * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory From 7a86de589582294a4ab3db3b3f2a75a1fa9d12bd Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:30:11 +0530 Subject: [PATCH 27/43] Update Conditions.php Declare module namespace before template path --- .../Magento/CatalogWidget/Block/Product/Widget/Conditions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php index ab089f105ccd5..9f7962301cab4 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php +++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php @@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface /** * @var string */ - protected $_template = 'Magento_Catalog::product/widget/conditions.phtml'; + protected $_template = 'Magento_CatalogWidget::product/widget/conditions.phtml'; /** * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory From 1fc549021532e6f583a70370d61c1ad54bd4a7f5 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:33:17 +0530 Subject: [PATCH 28/43] Update Created.php Declare module namespace before template path --- .../Product/Attribute/NewAttribute/Product/Created.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php index 9ebd5f3ee3705..92c40f71f2db9 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php @@ -16,7 +16,7 @@ class Created extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'catalog/product/attribute/new/created.phtml'; + protected $_template = 'Magento_ConfigurableProduct::catalog/product/attribute/new/created.phtml'; /** * Core registry From 1f83775b06436a0b2d501aaf3c4797735af71a10 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:34:01 +0530 Subject: [PATCH 29/43] Update Config.php Declare module namespace before template path --- .../Block/Adminhtml/Product/Edit/Tab/Variations/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php index c02a922c71b5c..1c5d01da574cf 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php +++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php @@ -18,7 +18,7 @@ class Config extends Widget implements TabInterface /** * @var string */ - protected $_template = 'catalog/product/edit/super/config.phtml'; + protected $_template = 'Magento_ConfigurableProduct::catalog/product/edit/super/config.phtml'; /** * Core registry From b15d83042175a0538a3e6cd351cafe1074d143fc Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:35:26 +0530 Subject: [PATCH 30/43] Update Currency.php Declare module namespace before template path --- .../Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php index c740b17ed008c..ec73ac0cf7aa5 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php @@ -20,7 +20,7 @@ class Currency extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'system/currency/rates.phtml'; + protected $_template = 'Magento_CurrencySymbol::system/currency/rates.phtml'; /** * Prepare layout From 3f4024e543eb6cbbf9f6b911ecd9344ba768d31f Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:36:00 +0530 Subject: [PATCH 31/43] Update Matrix.php Declare module namespace before template path --- .../Block/Adminhtml/System/Currency/Rate/Matrix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php index 80415c9486898..e20054a5a8084 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php @@ -16,7 +16,7 @@ class Matrix extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'system/currency/rate/matrix.phtml'; + protected $_template = 'Magento_CurrencySymbol::system/currency/rate/matrix.phtml'; /** * @var \Magento\Directory\Model\CurrencyFactory From b324468039006049f3ec7ebf67798a36b4f9d54d Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:36:41 +0530 Subject: [PATCH 32/43] Update Services.php Declare module namespace before template path --- .../Block/Adminhtml/System/Currency/Rate/Services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php index 919a4d0ed6d7b..491ed93900bde 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php @@ -16,7 +16,7 @@ class Services extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'system/currency/rate/services.phtml'; + protected $_template = 'Magento_CurrencySymbol::system/currency/rate/services.phtml'; /** * @var \Magento\Directory\Model\Currency\Import\Source\ServiceFactory From de3c0b8e8a776b47dd81c7bc27a35329038902d9 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:38:27 +0530 Subject: [PATCH 33/43] Update Newsletter.php Declare module namespace before template path --- app/code/Magento/Customer/Block/Newsletter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Block/Newsletter.php b/app/code/Magento/Customer/Block/Newsletter.php index 7a34b1d892bc1..a5e768915f91b 100644 --- a/app/code/Magento/Customer/Block/Newsletter.php +++ b/app/code/Magento/Customer/Block/Newsletter.php @@ -20,7 +20,7 @@ class Newsletter extends \Magento\Customer\Block\Account\Dashboard /** * @var string */ - protected $_template = 'form/newsletter.phtml'; + protected $_template = 'Magento_Customer::form/newsletter.phtml'; /** * @return bool From 8812a05ae0f0294e6d24ef7b67ebcf1ccb0e9f65 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:40:41 +0530 Subject: [PATCH 34/43] Update Newsletter.php Declare module namespace before template path --- .../Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php index 032d1ae5d732f..46a8dcfb28f1b 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php @@ -17,7 +17,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T /** * @var string */ - protected $_template = 'tab/newsletter.phtml'; + protected $_template = 'Magento_Customer::tab/newsletter.phtml'; /** * @var \Magento\Newsletter\Model\SubscriberFactory From 242de2d9b9b90a1594100c87a93e3bb6d10bc618 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:41:17 +0530 Subject: [PATCH 35/43] Update Vat.php Declare module namespace before template path --- .../Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php index 4a0d0f66425bb..9ee856f6e0af9 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php @@ -24,7 +24,7 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element /** * @var string */ - protected $_template = 'sales/order/create/address/form/renderer/vat.phtml'; + protected $_template = 'Magento_Customer::sales/order/create/address/form/renderer/vat.phtml'; /** * @var \Magento\Framework\Json\EncoderInterface From 098764d5d8315870790e8d1498a2997bbefee14d Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:42:08 +0530 Subject: [PATCH 36/43] Update Downloadable.php Declare module namespace before template path --- .../Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index 4019def9e0cd0..e2694b3b93bb9 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -33,7 +33,7 @@ class Downloadable extends Widget implements TabInterface /** * @var string */ - protected $_template = 'product/edit/downloadable.phtml'; + protected $_template = 'Magento_Downloadable::product/edit/downloadable.phtml'; /** * Accordion block id From 17ea28660dc3f13e1d4eb157b0f89303c9a5793b Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:42:40 +0530 Subject: [PATCH 37/43] Update Links.php Declare module namespace before template path --- .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index fab33673e182d..947e6dc1e8339 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -30,7 +30,7 @@ class Links extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'product/edit/downloadable/links.phtml'; + protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml'; /** * Downloadable file From 9a1d23b53cb50a43ac974cb677d17d0fea61f1b0 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:43:33 +0530 Subject: [PATCH 38/43] Update Samples.php Declare module namespace before template path --- .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php index 8b808c6020c5b..3c86bfb2f8d00 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php @@ -22,7 +22,7 @@ class Samples extends \Magento\Backend\Block\Widget /** * @var string */ - protected $_template = 'product/edit/downloadable/samples.phtml'; + protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml'; /** * Downloadable file From d7b93c7925dd62bacddeaa710965317d176619f7 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:44:50 +0530 Subject: [PATCH 39/43] Update Js.php Declare module namespace before template path --- app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php index 3ddfe494c7fbc..2633b78c67c78 100644 --- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php +++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php @@ -17,5 +17,5 @@ class Js extends \Magento\Backend\Block\Template * * @var string */ - protected $_template = 'attribute/edit/js.phtml'; + protected $_template = 'Magento_Eav::attribute/edit/js.phtml'; } From b79e560a41dd66aa58375205530e71d840b3d9c8 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:45:32 +0530 Subject: [PATCH 40/43] Update Template.php Declare module namespace before template path --- app/code/Magento/Email/Block/Adminhtml/Template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php index e12a5f15ad624..25348f9638f3e 100644 --- a/app/code/Magento/Email/Block/Adminhtml/Template.php +++ b/app/code/Magento/Email/Block/Adminhtml/Template.php @@ -22,7 +22,7 @@ class Template extends \Magento\Backend\Block\Template implements \Magento\Backe * * @var string */ - protected $_template = 'template/list.phtml'; + protected $_template = 'Magento_Email::template/list.phtml'; /** * @var \Magento\Backend\Block\Widget\Button\ButtonList From 0ce497a1f3eca04cf76fc099bb3bcd575a20d978 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:46:05 +0530 Subject: [PATCH 41/43] Update Edit.php Declare module namespace before template path --- app/code/Magento/Email/Block/Adminhtml/Template/Edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php index e1f4add630d7c..d6a2f1961ad18 100644 --- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php +++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php @@ -42,7 +42,7 @@ class Edit extends Widget implements ContainerInterface * * @var string */ - protected $_template = 'template/edit.phtml'; + protected $_template = 'Magento_Email::template/edit.phtml'; /** * @var \Magento\Framework\Json\EncoderInterface From b9792cdd0489c239bec19c9d8f792f66bd73b5c2 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:46:52 +0530 Subject: [PATCH 42/43] Update Inline.php Declare module namespace before template path --- app/code/Magento/GiftMessage/Block/Message/Inline.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php index 9e2747cf97fc1..9f68199106cc7 100644 --- a/app/code/Magento/GiftMessage/Block/Message/Inline.php +++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php @@ -33,7 +33,7 @@ class Inline extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'inline.phtml'; + protected $_template = 'Magento_GiftMessage::inline.phtml'; /** * Gift message message From 9f543474d73c498823e78ae98e656c43a70f7d41 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Wed, 4 Jul 2018 00:47:29 +0530 Subject: [PATCH 43/43] Update State.php Declare module namespace before template path --- app/code/Magento/LayeredNavigation/Block/Navigation/State.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php index ff3ab124a65ad..1f868a5b71754 100644 --- a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php +++ b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php @@ -18,7 +18,7 @@ class State extends \Magento\Framework\View\Element\Template /** * @var string */ - protected $_template = 'layer/state.phtml'; + protected $_template = 'Magento_LayeredNavigation::layer/state.phtml'; /** * Catalog layer