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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-08-21 19:04:20 +02:00
commit 34b3e4b8e2
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/install/startup.php
View file

@ -62,8 +62,10 @@ 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;
if (!empty($phpbb_installer_container))
{
try try
{ {
/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */ /** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
@ -74,6 +76,13 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline)
{ {
print($msg); print($msg);
} }
}
else
{
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;