diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-23 21:44:28 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-23 21:44:28 +0200 |
| commit | f56fe0ba8da2211d3947369e79952f294cffe7d6 (patch) | |
| tree | 13514ec7bd2c6253600755ae8fde5850c5dab5b5 /phpBB | |
| parent | 05851e2b4b1fe0ad44e3afc7e91f0e8716d76e42 (diff) | |
| parent | dd1b777ca779b60b3624e90a9c7a6831fbddf7c4 (diff) | |
| download | forums-f56fe0ba8da2211d3947369e79952f294cffe7d6.tar forums-f56fe0ba8da2211d3947369e79952f294cffe7d6.tar.gz forums-f56fe0ba8da2211d3947369e79952f294cffe7d6.tar.bz2 forums-f56fe0ba8da2211d3947369e79952f294cffe7d6.tar.xz forums-f56fe0ba8da2211d3947369e79952f294cffe7d6.zip | |
Merge pull request #3842 from CHItA/ticket/14097
[ticket/14097] Improve error and failure handling in the installer
* CHItA/ticket/14097:
[ticket/14097] Remove auto refresh on install failure
[ticket/14097] Improve error and failure handling in the installer
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/install/installer.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php index cb4ddb8783..755edb5297 100644 --- a/phpBB/phpbb/install/installer.php +++ b/phpBB/phpbb/install/installer.php @@ -92,7 +92,8 @@ class installer $module_found = false; // Variable used to check if the install process have been finished - $install_finished = false; + $install_finished = false; + $fail_cleanup = false; // We are installing something, so the introduction stage can go now... $this->install_config->set_finished_navigation_stage(array('install', 0, 'introduction')); @@ -209,13 +210,19 @@ class installer { // Do nothing } + catch (\Exception $e) + { + $this->iohandler->add_error_message($e->getMessage()); + $this->iohandler->send_response(); + $fail_cleanup = true; + } if ($install_finished) { // Send install finished message $this->iohandler->set_progress('INSTALLER_FINISHED', $this->install_config->get_task_progress_count()); } - else + else if (!$fail_cleanup) { $this->iohandler->request_refresh(); } @@ -223,7 +230,7 @@ class installer // Save install progress try { - if ($install_finished) + if ($install_finished || $fail_cleanup) { $this->install_config->clean_up_config_file(); } |