mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 19:54:12 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6256 from marc1706/ticket/16825

Browse Source 
[ticket/16825] Adjust handling of session ID when requiring cookies
This commit is contained in:
Máté Bartus
2021-08-19 21:59:16 +02:00
committed by GitHub
parent c1408ecf63 217fc07036
commit 49b01d05c1
13 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/session.php
View File

@@ -275,7 +275,7 @@ class session
$SID = '?sid=';
$_SID = '';
if (empty($this->session_id))
if (empty($this->session_id) && $phpbb_container->getParameter('session.force_sid'))
{
$this->session_id = $_SID = $request->variable('sid', '');
$SID = '?sid=' . $this->session_id;
@@ -284,7 +284,7 @@ class session
}
else
{
$this->session_id = $_SID = $request->variable('sid', '');
$this->session_id = $_SID = $phpbb_container->getParameter('session.force_sid') ? $request->variable('sid', '') : '';
$SID = '?sid=' . $this->session_id;
}