Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2021-05-05 20:14:44 +02:00
commit 69c0373a94
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -93,6 +93,21 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline)
case E_USER_ERROR:
$msg = '<b>General Error:</b><br>' . $msg_text . '<br> in file ' . $errfile . ' on line ' . $errline . '<br><br>';
if (!empty($phpbb_installer_container))
{
try
{
/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
$iohandler = $phpbb_installer_container->get('installer.helper.iohandler');
$iohandler->add_error_message($msg);
$iohandler->send_response(true);
exit();
}
catch (\phpbb\install\helper\iohandler\exception\iohandler_not_implemented_exception $e)
{
throw new \phpbb\exception\runtime_exception($msg);
}
}
throw new \phpbb\exception\runtime_exception($msg);
break;
case E_DEPRECATED: