diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-26 08:05:55 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-26 08:05:55 -0500 |
| commit | bbc531061f4d863ec19a558686ac804a8399f902 (patch) | |
| tree | 33e05316d17908be8e3ec19e92b0dcfffa655dd8 /phpBB/includes/session.php | |
| parent | cacead09a5447fdec9fcb9965b3cb667dcfe2032 (diff) | |
| parent | 14fc25b2525a5537188a22763addf660ec55770d (diff) | |
| download | forums-bbc531061f4d863ec19a558686ac804a8399f902.tar forums-bbc531061f4d863ec19a558686ac804a8399f902.tar.gz forums-bbc531061f4d863ec19a558686ac804a8399f902.tar.bz2 forums-bbc531061f4d863ec19a558686ac804a8399f902.tar.xz forums-bbc531061f4d863ec19a558686ac804a8399f902.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index b47eff0ab5..893ec2c0cc 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -598,6 +598,13 @@ class session $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: // Key didn't match one in the DB // User does not exist @@ -634,12 +641,6 @@ class session } 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; } |