From 7c9a5cb98b3e74c7fa956fa81ca194faf21ce8cf 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 c92b57fc5ae01c7a1ff92b01a900c0d157e10263 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 b8751c19ef752371f768ebbe01e75c58c4169ece 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 1c8a8d586bcb5..7e7f2825f1589 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php @@ -28,7 +28,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 c1282aa992b0e284556a09f83a95f015d47eddb5 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 5e98313f95f0f..da29b929f051c 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 0d9967332c9467cdbf9f7d47d335e03d4d272114 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 1111e20188707..c6ec328bc3028 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 01efc65c98b08939670b08d648147ef576372040 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 729f67b55fa13..2ee2696f903c5 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 @@ -21,7 +21,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 c1040236993fbd71671ee9e55c043aae232b3745 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 78ef94762b356c12372fe51117ffef5bee555346 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 0286a129d0921fc6733cbf18b54645568ebcdcda 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 82dfad3fc2aff..9dfc3a90f4410 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 @@ -19,7 +19,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 4310d507eec6005e776a79eebb50cd9df775a366 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 1bc6ea39a0ec6..58eab8a178f81 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php @@ -21,7 +21,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 d27263f683f066190741b5f96e0cfff775efdef9 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 f9d50021069b335a3ddc5ba1dca3a575c75403f2 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 7fe831470db3dd5e5eaa011f01b7470749cbf36d 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 b9fee3823bd68..1e0fb8b5bf34b 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 @@ -15,7 +15,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 3cfd5c40eb24da5ee925b8fad5b371c21e03c22c 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 4f6396a390ade837fb692e49e0762fd2aab7ca6e 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 64856a5c69dc7..8521c721eeb4d 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 43ee7dd8e12538b687666e7036324dc5c619bf40 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 4723db44dac501ba66bbb6da7cbd3628be047fe3 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 2f14719693dd539b695842e4cc59fd2d2aeb0393 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 5a33ee5399aaa55b0518dc855e4df4012e6ac32c 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 153466edaa22d94af13727d666bf429245e42420 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 2b03b6818efdabf7a94ded88706c560a9f7ce786 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 2ca0ad32ee2ee..ae87eb72556a2 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 69f5949f7b22bd5754e29219e08cb74bec0fddcb 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 70f6fe017f48ed59346b9cbeb778ee2644ffedcf 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 dbeff93683bc0..2b9cad379a8bc 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 c809d9f473ac50d6f17fd0a541495cd841ae87df 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 6be038ee00392..b698fc1514f73 100644 --- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php +++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php @@ -82,7 +82,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 e5d89652fcf437fed1955803002bd9da20bdd9df 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 598854a3e6bfe..4dd806d525d24 100644 --- a/app/code/Magento/Catalog/Block/Product/View/Additional.php +++ b/app/code/Magento/Catalog/Block/Product/View/Additional.php @@ -24,7 +24,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 cb94ab3838d38125227422e7a8cd9609b55364b1 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 17115ce7e5b1444f31a05b521015002c2d8eaa29 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 a924cadba8d817ff4368235652c9a1e751ad027f 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 33ea66b222420..96cc68cb9e314 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 @@ -15,7 +15,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 24ec04fd9f8c146e53ebd56525babb8f423dbec8 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 d5dbfb9ac366e2a5f9650cf72b6386bd8ff11edf 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 683c317d2ec74..55d42906b6119 100644 --- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php +++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php @@ -19,7 +19,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 d036eb2294e7c711b445a42cb210cfa2f53b4ce8 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 3548a085839440dac34ed45d600390fea89460b9 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 5a8877f6b2eb226e4a94a5b6f56b1ca334fa3213 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 3ac3258dfe0de..0aebf0a5c954f 100644 --- a/app/code/Magento/Customer/Block/Newsletter.php +++ b/app/code/Magento/Customer/Block/Newsletter.php @@ -19,7 +19,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 b83ebb5e13aed000d3a0efe895e7a9eee7616711 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 8506defbf9005..5eafd3a11871d 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 bee1aa498a326f815a97e0a7647495378b43de0d 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 54e0a3b53503f39f81943ec34ff58ed8b24347b1 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 6b97b70d41eb7f176f7b7e26fd1de20e2cfef37d 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 8d8791b790dd6416d10d2b351cb9ede9bdcaf17c 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 fd4d8f5281e3d4091c28d9a80e973649052861f0 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 a22995fcdd79701f4c1935ff0b85c21d26edb949 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 b68c7ae4e8f78..1f9432fb7581d 100644 --- a/app/code/Magento/Email/Block/Adminhtml/Template.php +++ b/app/code/Magento/Email/Block/Adminhtml/Template.php @@ -21,7 +21,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 7b18cefa859b170e1565dd06533deb55566968db 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 4a3b65fb13c7c..9413265e7f90f 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 87e2f8c1c6b344ab1549bf45f63c80ecc02f99f0 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 58e2e4bc3041100782c07f99ca693101cadbed90 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 93d99d3bc336b..7d061d057faaa 100644 --- a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php +++ b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php @@ -17,7 +17,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