Skip to content

Commit 02bd670

Browse files
authored
Fix warnings on undefined user agent (#2032)
1 parent d9fb8a7 commit 02bd670

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

app/code/core/Mage/Core/Model/Design/Package.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -672,15 +672,16 @@ protected function _checkUserAgentAgainstRegexps($regexpsConfigPath)
672672
public static function getPackageByUserAgent(array $rules, $regexpsConfigPath = 'path_mock')
673673
{
674674
foreach ($rules as $rule) {
675-
if (!empty(self::$_regexMatchCache[$rule['regexp']][$_SERVER['HTTP_USER_AGENT']])) {
675+
$userAgent = $_SERVER['HTTP_USER_AGENT'] ?? '';
676+
if (!empty(self::$_regexMatchCache[$rule['regexp']][$userAgent])) {
676677
self::$_customThemeTypeCache[$regexpsConfigPath] = $rule['value'];
677678
return $rule['value'];
678679
}
679680

680681
$regexp = '/' . trim($rule['regexp'], '/') . '/';
681682

682-
if (@preg_match($regexp, $_SERVER['HTTP_USER_AGENT'])) {
683-
self::$_regexMatchCache[$rule['regexp']][$_SERVER['HTTP_USER_AGENT']] = true;
683+
if (@preg_match($regexp, $userAgent)) {
684+
self::$_regexMatchCache[$rule['regexp']][$userAgent] = true;
684685
self::$_customThemeTypeCache[$regexpsConfigPath] = $rule['value'];
685686
return $rule['value'];
686687
}

0 commit comments

Comments
 (0)