Skip to content

Commit 91a4dbe

Browse files
committed
Merge remote-tracking branch 'trigger/AC-2003' into AC-1963
2 parents 5d6f807 + c1e3aa6 commit 91a4dbe

File tree

1 file changed

+2
-1
lines changed
  • lib/internal/Magento/Framework/View/Page

1 file changed

+2
-1
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,11 @@ public function __construct(
193193
$this->title = $title;
194194
$this->localeResolver = $localeResolver;
195195
$this->isIncludesAvailable = $isIncludesAvailable;
196+
$locale = $this->localeResolver->getLocale();
196197
$this->setElementAttribute(
197198
self::ELEMENT_TYPE_HTML,
198199
self::HTML_ATTRIBUTE_LANG,
199-
strstr($this->localeResolver->getLocale(), '_', true)
200+
$locale !== null ? strstr($locale, '_', true) : false
200201
);
201202
$this->escaper = $escaper ?? ObjectManager::getInstance()->get(
202203
Escaper::class

0 commit comments

Comments
 (0)