diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-22 18:39:01 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-03 14:23:34 +0100 |
| commit | 8ded30bbbe1e12ed301c2deb43d52da5a22d5b05 (patch) | |
| tree | 37108f36f7a9b88362b6c4ce9246543ffc4e8347 /phpBB | |
| parent | 9b4190e1365aed639068d341cb4296e895ad4ba1 (diff) | |
| download | forums-8ded30bbbe1e12ed301c2deb43d52da5a22d5b05.tar forums-8ded30bbbe1e12ed301c2deb43d52da5a22d5b05.tar.gz forums-8ded30bbbe1e12ed301c2deb43d52da5a22d5b05.tar.bz2 forums-8ded30bbbe1e12ed301c2deb43d52da5a22d5b05.tar.xz forums-8ded30bbbe1e12ed301c2deb43d52da5a22d5b05.zip | |
[ticket/14492] Fix redirection to help phpBB page
PHPBB3-14492
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/install/installer.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php index b8eef34a1d..abdb172cf3 100644 --- a/phpBB/phpbb/install/installer.php +++ b/phpBB/phpbb/install/installer.php @@ -60,6 +60,11 @@ class installer protected $web_root; /** + * @var \phpbb\user + */ + protected $user; + + /** * Stores the number of steps that a given module has * * @var array @@ -87,6 +92,7 @@ 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'); } /** @@ -243,8 +249,14 @@ class installer } else { - global $SID; - $acp_url = $this->web_root . 'adm/index.php' . $SID . '&i=acp_help_phpbb&mode=help_phpbb'; + // 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(); + $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); $this->iohandler->add_success_message('INSTALLER_FINISHED', array( 'ACP_LINK', $acp_url, |