makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14311] Use the iohandler for notices and warnings if possible

Browse source 
PHPBB3-14311
This commit is contained in:
Mate Bartus 2015-12-01 18:50:20 +01:00
parent 151535fdaf
commit d1fc8f79e7
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/install/startup.php
View file

@ -49,6 +49,8 @@ function phpbb_include_updated($path, $phpbb_root_path, $optional = false)
function installer_msg_handler($errno, $msg_text, $errfile, $errline) function installer_msg_handler($errno, $msg_text, $errfile, $errline)
{ {
global $phpbb_installer_container;
switch ($errno) switch ($errno)
{ {
case E_NOTICE: case E_NOTICE:
@ -56,7 +58,17 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline)
case E_USER_WARNING: case E_USER_WARNING:
case E_USER_NOTICE: case E_USER_NOTICE:
$msg = '[phpBB debug] "' . $msg_text . '" in file ' . $errfile . ' on line ' . $errline; $msg = '[phpBB debug] "' . $msg_text . '" in file ' . $errfile . ' on line ' . $errline;
throw new \phpbb\exception\runtime_exception($msg);
try
{
/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
$iohandler = $phpbb_installer_container->get('installer.helper.iohandler');
$iohandler->add_warning_message($msg);
}
catch (\phpbb\install\helper\iohandler\exception\iohandler_not_implemented_exception $e)
{
print ($msg);
}
break; break;
case E_USER_ERROR: case E_USER_ERROR:
$msg = '<b>General Error:</b><br />' . $msg_text . '<br /> in file ' . $errfile . ' on line ' . $errline; $msg = '<b>General Error:</b><br />' . $msg_text . '<br /> in file ' . $errfile . ' on line ' . $errline;