mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00
Code Issues Releases Wiki Activity

[ticket/14492] Add user service to installer & only instantiate if needed

Browse Source 
PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-11-24 20:38:29 +01:00
parent 8ded30bbbe
commit 5895f56de0
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/config/installer/container/services.yml
View File

@ -88,6 +88,12 @@ services:
calls:
- [setLexer, ['@template.twig.lexer']]
user:
class: phpbb\user
arguments:
- '@language'
- '%datetime.class%'
console.exception_subscriber:
class: phpbb\console\exception_subscriber
arguments:

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

@ -59,11 +59,6 @@ class installer
*/
protected $web_root;
/**
* @var \phpbb\user
*/
protected $user;
/**
* Stores the number of steps that a given module has
*
@ -92,7 +87,6 @@ class installer
$this->installer_modules = null;
$this->web_root = $path_helper->get_web_root_path();
$this->purge_cache_before = false;
$this->user = $container->get('user');
}
/**
@ -251,12 +245,13 @@ class installer
{
// Start session and try to apply session id
$auth = $this->container_factory->get('auth');
$this->user->session_begin();
$auth->acl($this->user->data);
$this->user->setup();
$user = $this->container_factory->get('user');
$user->session_begin();
$auth->acl($user->data);
$user->setup();
$phpbb_root_path = $this->container_factory->get_parameter('core.root_path');
$acp_url = append_sid($phpbb_root_path . 'adm/index.php', 'i=acp_help_phpbb&mode=help_phpbb', true, $this->user->session_id);
$acp_url = append_sid($phpbb_root_path . 'adm/index.php', 'i=acp_help_phpbb&mode=help_phpbb', true, $user->session_id);
$this->iohandler->add_success_message('INSTALLER_FINISHED', array(
'ACP_LINK',
$acp_url,