diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-22 18:25:33 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-22 18:25:33 +0200 |
| commit | ed07f1b85eb95eb108987fc1a6187fa9bf311ace (patch) | |
| tree | bbe943fca3aec1f2acbbe0584d2febf81c68a666 | |
| parent | e360f911f854d88c9bdc875f9f938709847ce32b (diff) | |
| parent | 7cccd59cdc0f89d13b57c1aacad72dc5687dd453 (diff) | |
| download | forums-ed07f1b85eb95eb108987fc1a6187fa9bf311ace.tar forums-ed07f1b85eb95eb108987fc1a6187fa9bf311ace.tar.gz forums-ed07f1b85eb95eb108987fc1a6187fa9bf311ace.tar.bz2 forums-ed07f1b85eb95eb108987fc1a6187fa9bf311ace.tar.xz forums-ed07f1b85eb95eb108987fc1a6187fa9bf311ace.zip | |
Merge pull request #2248 from Elsensee/ticket/12193
[ticket/12193] Fix broken HTML if SQL error occurs during migration
* Elsensee/ticket/12193:
[ticket/12193] Fix broken HTML if SQL error occurs during migration
| -rw-r--r-- | phpBB/includes/functions.php | 10 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 69f7c3f162..0cb88cd8ee 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3849,6 +3849,16 @@ function msg_handler($errno, $msg_text, $errfile, $errline) if (defined('IN_INSTALL') || defined('DEBUG') || isset($auth) && $auth->acl_get('a_')) { $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)) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index bad51e2fe3..6c9eeb6a75 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -169,6 +169,8 @@ header('Content-type: text/html; charset=UTF-8'); <?php +define('IN_DB_UPDATE', true); + /** * @todo firebird/mysql update? */ |