mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00
Code Issues Releases Wiki Activity

[ticket/13740] Fix CS and docblocks

Browse Source 
PHPBB3-13740
This commit is contained in:
Mate Bartus
2015-07-21 14:42:15 +02:00
parent 0488c49116
commit b2b9fb1df2
10 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,6 @@ namespace phpbb\install;
use phpbb\di\ordered_service_collection;
use phpbb\install\exception\installer_config_not_writable_exception;
use phpbb\install\exception\invalid_service_name_exception;
use phpbb\install\exception\resource_limit_reached_exception;
use phpbb\install\exception\user_interaction_required_exception;
use phpbb\install\helper\config;
@@ -94,9 +93,6 @@ class installer
// Variable used to check if the install process have been finished
$install_finished = false;
// Flag used by exception handling, whether or not we need to flush output buffer once again
$flush_messages = false;
// We are installing something, so the introduction stage can go now...
$this->install_config->set_finished_navigation_stage(array('install', 0, 'introduction'));
$this->iohandler->set_finished_stage_menu(array('install', 0, 'introduction'));
@@ -184,22 +180,6 @@ class installer
{
// Do nothing
}
catch (invalid_service_name_exception $e)
{
$params = $e->get_parameters();
if (!empty($params))
{
array_unshift($params, $e->getMessage());
}
else
{
$params = $e->getMessage();
}
$this->iohandler->add_error_message($params);
$flush_messages = true;
}
if ($install_finished)
{
@@ -211,11 +191,6 @@ class installer
$this->iohandler->request_refresh();
}
if ($flush_messages)
{
$this->iohandler->send_response();
}
// Save install progress
try
{