Skip to content

[Backport] Declare module namespace before template path name #16577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 43 commits into from
Jul 6, 2018
Merged

[Backport] Declare module namespace before template path name #16577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
50364d1
Update AssignProducts.php
mageprince Jul 3, 2018
3156f06
Update DefaultCaptcha.php
mageprince Jul 3, 2018
320748c
Update Tree.php
mageprince Jul 3, 2018
2ea290a
Update Chooser.php
mageprince Jul 3, 2018
fff72b6
Update Edit.php
mageprince Jul 3, 2018
534e755
Update Main.php
mageprince Jul 3, 2018
bf502d4
Update Group.php
mageprince Jul 3, 2018
c5a77ff
Update Add.php
mageprince Jul 3, 2018
154cde1
Update Main.php
mageprince Jul 3, 2018
c65e4d7
Update Configure.php
mageprince Jul 3, 2018
c34bc82
Update Alerts.php
mageprince Jul 3, 2018
835372f
Update Inventory.php
mageprince Jul 3, 2018
e139ab4
Update Options.php
mageprince Jul 3, 2018
1f352cf
Update Websites.php
mageprince Jul 3, 2018
fec40bd
Update Option.php
mageprince Jul 3, 2018
09e2e5b
Update Date.php
mageprince Jul 3, 2018
1756134
Update File.php
mageprince Jul 3, 2018
8af67d8
Update Select.php
mageprince Jul 3, 2018
5b353f4
Update Text.php
mageprince Jul 3, 2018
a1ccb20
Update Tier.php
mageprince Jul 3, 2018
964e126
Update Content.php
mageprince Jul 3, 2018
331c07a
Update Container.php
mageprince Jul 3, 2018
7a475a7
Update Link.php
mageprince Jul 3, 2018
1bc1104
Update Toolbar.php
mageprince Jul 3, 2018
4bf400d
Update Additional.php
mageprince Jul 3, 2018
362b942
Update Conditions.php
mageprince Jul 3, 2018
1cbcd7c
Update Conditions.php
mageprince Jul 3, 2018
ea49cd6
Update Created.php
mageprince Jul 3, 2018
af5ca55
Update Config.php
mageprince Jul 3, 2018
562ad21
Update Currency.php
mageprince Jul 3, 2018
fbfdf47
Update Matrix.php
mageprince Jul 3, 2018
0f981cf
Update Services.php
mageprince Jul 3, 2018
abdba4d
Update Newsletter.php
mageprince Jul 3, 2018
63d0ff9
Update Newsletter.php
mageprince Jul 3, 2018
4a4d5e3
Update Vat.php
mageprince Jul 3, 2018
d9f848f
Update Downloadable.php
mageprince Jul 3, 2018
1f6d6a4
Update Links.php
mageprince Jul 3, 2018
6dafb79
Update Samples.php
mageprince Jul 3, 2018
cfdf23d
Update Js.php
mageprince Jul 3, 2018
d219d1c
Update Template.php
mageprince Jul 3, 2018
5a11c63
Update Edit.php
mageprince Jul 3, 2018
a66dbfd
Update Inline.php
mageprince Jul 3, 2018
613b07d
Update State.php
mageprince Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'default.phtml';
protected $_template = 'Magento_Captcha::default.phtml';

/**
* @var string
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Product/View/Additional.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface
/**
* @var string
*/
protected $_template = 'product/widget/conditions.phtml';
protected $_template = 'Magento_CatalogWidget::product/widget/conditions.phtml';

/**
* @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
Expand Down
2 changes: 1 addition & 1 deletion ...to/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/Block/Newsletter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...de/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Email/Block/Adminhtml/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/GiftMessage/Block/Message/Inline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/LayeredNavigation/Block/Navigation/State.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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
Expand Down