Skip to content

Commit dcfa68c

Browse files
Merge forwardport of #12031 to 2.3-develop branch
Applied pull request patch https://github.com/magento/magento2/pull/12031.patch (created by @enriquei4) based on commit(s): 1. bce7d56 Fixed GitHub Issues in 2.3-develop branch: - #6661: XHTML templates Don't Use Schema URNs (reported by @astorm)
2 parents d28ddba + 24dcb91 commit dcfa68c

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
8+
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
99
<div data-bind="scope: '{{getName()}}.areas'" class="entry-edit form-inline">
1010
<!-- ko template: getTemplate() --><!-- /ko -->
1111
</div>

app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
8+
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
99
<div data-bind="scope: '{{getName()}}.areas'">
1010
<!-- ko template: getTemplate() --><!-- /ko -->
1111
</div>

app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
8+
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
99
<div data-role="spinner" data-component="{{getName()}}.{{getName()}}" class="admin__form-loading-mask">
1010
<div class="spinner">
1111
<span/><span/><span/><span/><span/><span/><span/><span/>

app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
8+
<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
99
<div data-role="spinner" data-component="{{getName()}}.areas" class="admin__data-grid-loading-mask">
1010
<div class="spinner">
1111
<span/><span/><span/><span/><span/><span/><span/><span/>

app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
class="admin__data-grid-outer-wrap"
1010
data-bind="scope: '{{getName()}}.{{getName()}}'"
1111
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12-
xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
12+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
1313
<div data-role="spinner" data-component="{{getName()}}.{{getName()}}.{{spinner}}" class="admin__data-grid-loading-mask">
1414
<div class="spinner">
1515
<span/><span/><span/><span/><span/><span/><span/><span/>

0 commit comments

Comments
 (0)