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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12193] Fix broken HTML if SQL error occurs during migration
This commit is contained in:
Joas Schilling 2014-04-22 18:27:58 +02:00
commit cde0ebccd0
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/functions.php
View file

@ -3849,6 +3849,16 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
if (defined('IN_INSTALL') || defined('DEBUG') || isset($auth) && $auth->acl_get('a_')) if (defined('IN_INSTALL') || defined('DEBUG') || isset($auth) && $auth->acl_get('a_'))
{ {
$msg_text = $log_text; $msg_text = $log_text;
// If this is defined there already was some output
// So let's not break it
if (defined('IN_DB_UPDATE'))
{
echo '<div class="errorbox">' . $msg_text . '</div>';
$db->sql_return_on_error(true);
phpbb_end_update($cache, $config);
}
} }
if ((defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db)) if ((defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db))

2
phpBB/install/database_update.php
View file

@ -169,6 +169,8 @@ header('Content-type: text/html; charset=UTF-8');
<?php <?php
define('IN_DB_UPDATE', true);
/** /**
* @todo firebird/mysql update? * @todo firebird/mysql update?
*/ */