Skip to content

Commit b5f47a1

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #16577: [Backport] Declare module namespace before template path name (by @mageprince) - #16586: [Backport] Declare module namespace before template path name(Magento_Sales::order/creditmemo.phtml). (by @mageprince)
2 parents e43594e + bd95228 commit b5f47a1

File tree

43 files changed

+44
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+44
-43
lines changed

app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'default.phtml';
18+
protected $_template = 'Magento_Captcha::default.phtml';
1919

2020
/**
2121
* @var string

app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template
1313
*
1414
* @var string
1515
*/
16-
protected $_template = 'catalog/category/edit/assign_products.phtml';
16+
protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml';
1717

1818
/**
1919
* @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product
@@ -87,6 +87,7 @@ public function getProductsJson()
8787
}
8888
return '{}';
8989
}
90+
9091
/**
9192
* Retrieve current category instance
9293
*

app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
2727
/**
2828
* @var string
2929
*/
30-
protected $_template = 'catalog/category/tree.phtml';
30+
protected $_template = 'Magento_Catalog::catalog/category/tree.phtml';
3131

3232
/**
3333
* @var \Magento\Backend\Model\Auth\Session

app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
2424
*
2525
* @var string
2626
*/
27-
protected $_template = 'catalog/category/widget/tree.phtml';
27+
protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml';
2828

2929
/**
3030
* @return void

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Main extends \Magento\Backend\Block\Template
1818
/**
1919
* @var string
2020
*/
21-
protected $_template = 'catalog/product/attribute/set/main.phtml';
21+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main.phtml';
2222

2323
/**
2424
* Core registry

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ class Group extends \Magento\Backend\Block\Template
1414
/**
1515
* @var string
1616
*/
17-
protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
17+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/group.phtml';
1818
}

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Add extends \Magento\Backend\Block\Template
1818
/**
1919
* @var string
2020
*/
21-
protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
21+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/add.phtml';
2222

2323
/**
2424
* @return AbstractBlock

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Main extends \Magento\Backend\Block\Template
1616
/**
1717
* @var string
1818
*/
19-
protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml';
19+
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/main.phtml';
2020

2121
/**
2222
* @return $this

app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Configure extends \Magento\Backend\Block\Widget
2121
/**
2222
* @var string
2323
*/
24-
protected $_template = 'catalog/product/composite/configure.phtml';
24+
protected $_template = 'Magento_Catalog::catalog/product/composite/configure.phtml';
2525

2626
/**
2727
* Core registry

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Edit extends \Magento\Backend\Block\Widget
1717
/**
1818
* @var string
1919
*/
20-
protected $_template = 'catalog/product/edit.phtml';
20+
protected $_template = 'Magento_Catalog::catalog/product/edit.phtml';
2121

2222
/**
2323
* Core registry

0 commit comments

Comments
 (0)