mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-05 00:07:44 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
This commit is contained in:
@@ -598,6 +598,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
|
||||||
@@ -634,12 +641,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user