diff --git a/pub/errors/processor.php b/pub/errors/processor.php index 0cb182700856c..a63ce9342db17 100644 --- a/pub/errors/processor.php +++ b/pub/errors/processor.php @@ -187,6 +187,15 @@ public function __construct( $this->_root = is_dir($this->_indexDir . 'app'); $this->_prepareConfig(); + + if (isset($_ENV['MAGE_RUN_CODE'])) { + $this->_setSkin($_ENV['MAGE_RUN_CODE']); + + if (isset($_ENV['MAGE_RUN_TYPE'])) { + $this->_setSkin($ENV_['MAGE_RUN_TYPE'] . '-' . $_ENV['MAGE_RUN_CODE']); + } + } + if (isset($_GET['skin'])) { $this->_setSkin($_GET['skin']); } @@ -729,7 +738,7 @@ protected function _validate() */ protected function _setSkin($value, \stdClass $config = null) { - if (preg_match('/^[a-z0-9_]+$/i', $value) && is_dir($this->_errorDir . $value)) { + if (preg_match('/^[a-z0-9_-]+$/i', $value) && is_dir($this->_errorDir . $value)) { if (!$config) { if ($this->_config) { $config = $this->_config;