Skip to content

Commit 58b0113

Browse files
committed
Merge remote-tracking branch 'origin/AC-15667' into spartans_pr_11112025
2 parents 4bf01a2 + d43c76c commit 58b0113

File tree

2 files changed

+737
-7
lines changed

2 files changed

+737
-7
lines changed

lib/internal/Magento/Framework/Escaper.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright 2014 Adobe
3+
* Copyright 2025 Adobe
44
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
@@ -280,7 +280,7 @@ public function escapeHtmlAttr($string, $escapeSingleQuote = true)
280280
$translateInline = $this->getTranslateInline();
281281

282282
return $translateInline->isAllowed()
283-
? $this->inlineSensitiveEscapeHthmlAttr($string)
283+
? $this->inlineSensitiveEscapeHtmlAttr($string)
284284
: $this->getEscaper()->escapeHtmlAttr($string);
285285
}
286286

@@ -407,12 +407,12 @@ public function escapeXssInUrl($data)
407407
private function escapeScriptIdentifiers(string $data): string
408408
{
409409
$filteredData = preg_replace('/[\x00-\x1F\x7F\xA0]/u', '', $data);
410-
if ($filteredData === false || $filteredData === '') {
410+
if ($filteredData === null || $filteredData === '') {
411411
return '';
412412
}
413413

414414
$filteredData = preg_replace(self::$xssFiltrationPattern, ':', $filteredData);
415-
if ($filteredData === false) {
415+
if ($filteredData === null) {
416416
return '';
417417
}
418418

@@ -518,7 +518,7 @@ private function getTranslateInline()
518518
* @param string $text
519519
* @return string
520520
*/
521-
private function inlineSensitiveEscapeHthmlAttr(string $text): string
521+
private function inlineSensitiveEscapeHtmlAttr(string $text): string
522522
{
523523
$escaper = $this->getEscaper();
524524
$textLength = strlen($text);

0 commit comments

Comments
 (0)