mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2016-08-21 19:04:20 +02:00
parent 229816ebe8 f814840568
commit 34b3e4b8e2
1 changed files with 16 additions and 7 deletions
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_USER_WARNING:
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
{
/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
@@ -74,6 +76,13 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline)
{
print($msg);
}
}
else
{
print($msg);
}
return;
break;
case E_USER_ERROR:
$msg = '<b>General Error:</b><br />' . $msg_text . '<br /> in file ' . $errfile . ' on line ' . $errline;