makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Máté Bartus 2016-12-08 20:56:04 +01:00
commit e5baca179d
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/phpbb/install/installer.php
View file

@ -243,12 +243,18 @@ class installer
} }
else else
{ {
// Start session and try to apply session id // Start session if not installing and get user object
$auth = $this->container_factory->get('auth'); // to allow redirecting to ACP
$user = $this->container_factory->get('user'); $user = $this->container_factory->get('user');
$user->session_begin(); if (!isset($module) || !($module instanceof \phpbb\install\module\install_finish\module))
$auth->acl($user->data); {
$user->setup(); $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'); $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); $acp_url = append_sid($phpbb_root_path . 'adm/index.php', 'i=acp_help_phpbb&mode=help_phpbb', true, $user->session_id);