mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4416 from Elsensee/ticket/14746

Browse Source 
[ticket/14746] Make msg_handler in installer independent from container
This commit is contained in:
Marc Alexander 2016-08-21 19:04:17 +02:00
commit f814840568
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/install/startup.php
View File

@ -62,18 +62,27 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline)
case E_WARNING: case E_WARNING:
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;
try if (!empty($phpbb_installer_container))
{ {
/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */ try
$iohandler = $phpbb_installer_container->get('installer.helper.iohandler'); {
$iohandler->add_warning_message($msg); /** @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);
}
} }
catch (\phpbb\install\helper\iohandler\exception\iohandler_not_implemented_exception $e) else
{ {
print ($msg); print($msg);
} }
return;
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;