Skip to content

Commit b84bd79

Browse files
author
roman
committed
MAGETWO-95386: Fixed incorrect design exceptions functional
1 parent 9533cee commit b84bd79

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

app/code/Magento/Theme/Model/Design/Backend/Exceptions.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Magento\Config\Model\Config\Backend\Serialized\ArraySerialized;
99
use Magento\Framework\App\ObjectManager;
1010
use Magento\Framework\Unserialize\SecureUnserializer;
11-
use Psr\Log\LoggerInterface;
1211

1312
class Exceptions extends ArraySerialized
1413
{
@@ -182,7 +181,6 @@ private function validateValue($value)
182181
if (is_string($value)) {
183182
$this->secureUnserializer->unserialize($value);
184183
}
185-
186184
} catch (\InvalidArgumentException $e) {
187185
$this->_logger->critical($e->getMessage());
188186
$value = false;

lib/internal/Magento/Framework/View/DesignExceptions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Framework\View;
77

88
use Magento\Framework\App\ObjectManager;
9-
use Magento\Framework\Unserialize\Unserialize;
9+
use Magento\Framework\Unserialize\SecureUnserializer as Unserialize;
1010
use Psr\Log\LoggerInterface;
1111

1212
/**
@@ -89,7 +89,7 @@ public function getThemeByRequest(\Magento\Framework\App\Request\Http $request)
8989

9090
try {
9191
$expressions = $this->secureUnserializer->unserialize($expressions);
92-
} catch (\Exception $e) {
92+
} catch (\InvalidArgumentException $e) {
9393
$this->logger->critical($e->getMessage());
9494
return false;
9595
}

0 commit comments

Comments
 (0)