diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-12-08 20:55:14 +0100 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2016-12-08 20:55:14 +0100 |
| commit | 1be233a801371918e3b23f4493dd3169427b4a16 (patch) | |
| tree | d3f4aef0af31fa2b5c1a93b87e559cfafae7b9d6 | |
| parent | 69a5ed78cf208612b98cab0c8f23be3d671e7d27 (diff) | |
| parent | 829e1475044f1a72f68958923a0900ed4e62f78e (diff) | |
| download | forums-1be233a801371918e3b23f4493dd3169427b4a16.tar forums-1be233a801371918e3b23f4493dd3169427b4a16.tar.gz forums-1be233a801371918e3b23f4493dd3169427b4a16.tar.bz2 forums-1be233a801371918e3b23f4493dd3169427b4a16.tar.xz forums-1be233a801371918e3b23f4493dd3169427b4a16.zip | |
Merge pull request #4565 from marc1706/ticket/14896
[ticket/14896] Do not overwrite login when finishing install
| -rw-r--r-- | phpBB/phpbb/install/installer.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php index a7d3b99dcb..e04e233a76 100644 --- a/phpBB/phpbb/install/installer.php +++ b/phpBB/phpbb/install/installer.php @@ -243,12 +243,18 @@ class installer } else { - // Start session and try to apply session id - $auth = $this->container_factory->get('auth'); + // Start session if not installing and get user object + // to allow redirecting to ACP $user = $this->container_factory->get('user'); - $user->session_begin(); - $auth->acl($user->data); - $user->setup(); + if (!isset($module) || !($module instanceof \phpbb\install\module\install_finish\module)) + { + $auth = $this->container_factory->get('auth'); + + $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, $user->session_id); |