aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMate Bartus <mate.bartus@gmail.com>2015-08-17 20:24:01 +0200
committerMate Bartus <mate.bartus@gmail.com>2015-08-21 18:03:36 +0200
commitdd1b777ca779b60b3624e90a9c7a6831fbddf7c4 (patch)
tree18b05c0f99c17fd60b15b588e334b610d0e388e8 /phpBB/phpbb
parentf4f0ff0eec78c85b4ec2962a0de06d9aa2bd37a5 (diff)
downloadforums-dd1b777ca779b60b3624e90a9c7a6831fbddf7c4.tar
forums-dd1b777ca779b60b3624e90a9c7a6831fbddf7c4.tar.gz
forums-dd1b777ca779b60b3624e90a9c7a6831fbddf7c4.tar.bz2
forums-dd1b777ca779b60b3624e90a9c7a6831fbddf7c4.tar.xz
forums-dd1b777ca779b60b3624e90a9c7a6831fbddf7c4.zip
[ticket/14097] Remove auto refresh on install failure
PHPBB3-14097
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/install/installer.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index 78a0de0241..755edb5297 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -212,7 +212,6 @@ class installer
}
catch (\Exception $e)
{
- // Most likely there were a PHP failure, so let's die like a gentleman
$this->iohandler->add_error_message($e->getMessage());
$this->iohandler->send_response();
$fail_cleanup = true;
@@ -223,7 +222,7 @@ class installer
// 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();
}