Skip to content

Commit 15f11fe

Browse files
committed
Merge remote-tracking branch '38119/catch-php-errors-as-well-so-no-html-gets-outputted' into bt_comm_pr_247beta3
2 parents 91598c2 + 470d9e5 commit 15f11fe

File tree

1 file changed

+1
-5
lines changed
  • lib/internal/Magento/Framework/View/TemplateEngine

1 file changed

+1
-5
lines changed

lib/internal/Magento/Framework/View/TemplateEngine/Php.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@
1616
class Php implements TemplateEngineInterface
1717
{
1818
/**
19-
* Current block
20-
*
2119
* @var BlockInterface
2220
*/
2321
protected $_currentBlock;
2422

2523
/**
26-
* Helper factory
27-
*
2824
* @var \Magento\Framework\ObjectManagerInterface
2925
*/
3026
protected $_helperFactory;
@@ -70,7 +66,7 @@ public function render(BlockInterface $block, $fileName, array $dictionary = [])
7066
extract($dictionary, EXTR_SKIP);
7167
include $fileName;
7268
$this->_currentBlock = $tmpBlock;
73-
} catch (\Exception $exception) {
69+
} catch (\Throwable $exception) {
7470
ob_end_clean();
7571
throw $exception;
7672
}

0 commit comments

Comments
 (0)