mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 06:55:25 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3842 from CHItA/ticket/14097

Browse Source 
[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
This commit is contained in:
Tristan Darricau 2015-08-23 21:44:28 +02:00
commit f56fe0ba8d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/phpbb/install/installer.php
View File

@ -92,7 +92,8 @@ class installer
$module_found = false; $module_found = false;
// Variable used to check if the install process have been finished // 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... // We are installing something, so the introduction stage can go now...
$this->install_config->set_finished_navigation_stage(array('install', 0, 'introduction')); $this->install_config->set_finished_navigation_stage(array('install', 0, 'introduction'));
@ -209,13 +210,19 @@ class installer
{ {
// Do nothing // Do nothing
} }
catch (\Exception $e)
{
$this->iohandler->add_error_message($e->getMessage());
$this->iohandler->send_response();
$fail_cleanup = true;
}
if ($install_finished) if ($install_finished)
{ {
// Send install finished message // Send install finished message
$this->iohandler->set_progress('INSTALLER_FINISHED', $this->install_config->get_task_progress_count()); $this->iohandler->set_progress('INSTALLER_FINISHED', $this->install_config->get_task_progress_count());
} }
else else if (!$fail_cleanup)
{ {
$this->iohandler->request_refresh(); $this->iohandler->request_refresh();
} }
@ -223,7 +230,7 @@ class installer
// Save install progress // Save install progress
try try
{ {
if ($install_finished) if ($install_finished || $fail_cleanup)
{ {
$this->install_config->clean_up_config_file(); $this->install_config->clean_up_config_file();
} }