mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Merge branch 'ticket/bantu/9912' into develop-olympus
* ticket/bantu/9912: [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
This commit is contained in:
commit
14fc25b252
1 changed files with 7 additions and 6 deletions
|
@ -583,6 +583,13 @@ class session
|
||||||
$bot = false;
|
$bot = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Bot user, if they have a SID in the Request URI we need to get rid of it
|
||||||
|
// otherwise they'll index this page with the SID, duplicate content oh my!
|
||||||
|
if ($bot && isset($_GET['sid']))
|
||||||
|
{
|
||||||
|
redirect(build_url(array('sid')));
|
||||||
|
}
|
||||||
|
|
||||||
// If no data was returned one or more of the following occurred:
|
// If no data was returned one or more of the following occurred:
|
||||||
// Key didn't match one in the DB
|
// Key didn't match one in the DB
|
||||||
// User does not exist
|
// User does not exist
|
||||||
|
@ -619,12 +626,6 @@ class session
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Bot user, if they have a SID in the Request URI we need to get rid of it
|
|
||||||
// otherwise they'll index this page with the SID, duplicate content oh my!
|
|
||||||
if (isset($_GET['sid']))
|
|
||||||
{
|
|
||||||
redirect(build_url(array('sid')));
|
|
||||||
}
|
|
||||||
$this->data['session_last_visit'] = $this->time_now;
|
$this->data['session_last_visit'] = $this->time_now;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue