Skip to content

Commit 8d9dc65

Browse files
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #12955: [Backport to 2.3-develop] Fix #10682: Meta description and keywords transform to html entities (by @dverkade) - #12960: [Backport to 2.3-develop] Fix #11236: Web Setup Wizard Icon Inconsistency (by @dverkade) - #12947: [Port 2.3-develop] Respect "Learn More Link" in Recently Viewed Products widget options (by @JeroenVanLeusden) Fixed GitHub Issues: - #10682: Meta description and keywords transform to html entities for non latin/cyrilic characters in category and product pages (reported by @fouli86) has been fixed in #12955 by @dverkade in 2.3-develop branch Related commits: 1. c49c52a - #11236: Web Setup Wizard Icon Inconsistency (reported by @Franzld) has been fixed in #12960 by @dverkade in 2.3-develop branch Related commits: 1. 8cb5b9c
2 parents 5dc38df + 3a0de7a commit 8d9dc65

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

app/code/Magento/Catalog/view/base/web/template/product/link.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<a class="product-item-link"
7+
<a if="isAllowed()"
8+
class="product-item-link"
89
attr="href: $row().url"
910
text="label"/>

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_menu.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@
5656
}
5757
}
5858

59-
.item-component {
59+
.item-component,
60+
.item-extension {
6061
> a {
6162
&:before {
6263
content: @icon-lego__content;
6364
}
6465
}
6566
}
6667

67-
.item-extension {
68+
.item-module {
6869
> a {
6970
&:before {
7071
content: @icon-module__content;

lib/internal/Magento/Framework/View/Page/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public function getTitle()
226226
public function setMetadata($name, $content)
227227
{
228228
$this->build();
229-
$this->metadata[$name] = htmlentities($content);
229+
$this->metadata[$name] = htmlspecialchars($content);
230230
}
231231

232232
/**

setup/pub/styles/setup.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup/view/magento/setup/navigation/side-menu.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<span>Extension Manager</span>
4040
</a>
4141
</li>
42-
<li class="item-component level-0" ng-class="{_active: $state.current.type === 'module'}">
42+
<li class="item-module level-0" ng-class="{_active: $state.current.type === 'module'}">
4343
<a href="" ui-sref="root.module">
4444
<span>Module Manager</span>
4545
</a>

0 commit comments

Comments
 (0)