mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch '3.3.x'
This commit is contained in:
commit
badf349f66
1 changed files with 7 additions and 1 deletions
|
@ -49,13 +49,19 @@ 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;
|
global $phpbb_installer_container, $msg_long_text;
|
||||||
|
|
||||||
if (error_reporting() == 0)
|
if (error_reporting() == 0)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the message handler is stripping text, fallback to the long version if available
|
||||||
|
if (!$msg_text && !empty($msg_long_text))
|
||||||
|
{
|
||||||
|
$msg_text = $msg_long_text;
|
||||||
|
}
|
||||||
|
|
||||||
switch ($errno)
|
switch ($errno)
|
||||||
{
|
{
|
||||||
case E_NOTICE:
|
case E_NOTICE:
|
||||||
|
|
Loading…
Add table
Reference in a new issue