diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-24 20:38:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-03 14:23:34 +0100 |
| commit | 5895f56de05b637765a6583b8c51c1db3daabe91 (patch) | |
| tree | 3ed42316c51a61a1f40fb4a2c2f5952efc64c11d | |
| parent | 8ded30bbbe1e12ed301c2deb43d52da5a22d5b05 (diff) | |
| download | forums-5895f56de05b637765a6583b8c51c1db3daabe91.tar forums-5895f56de05b637765a6583b8c51c1db3daabe91.tar.gz forums-5895f56de05b637765a6583b8c51c1db3daabe91.tar.bz2 forums-5895f56de05b637765a6583b8c51c1db3daabe91.tar.xz forums-5895f56de05b637765a6583b8c51c1db3daabe91.zip | |
[ticket/14492] Add user service to installer & only instantiate if needed
PHPBB3-14492
| -rw-r--r-- | phpBB/config/installer/container/services.yml | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/install/installer.php | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml index 4c3ed3bfcb..c16547c649 100644 --- a/phpBB/config/installer/container/services.yml +++ b/phpBB/config/installer/container/services.yml @@ -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: diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php index abdb172cf3..a7d3b99dcb 100644 --- a/phpBB/phpbb/install/installer.php +++ b/phpBB/phpbb/install/installer.php @@ -60,11 +60,6 @@ class installer protected $web_root; /** - * @var \phpbb\user - */ - protected $user; - - /** * Stores the number of steps that a given module has * * @var array @@ -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, |