aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-18 22:10:31 +0100
committerNils Adermann <naderman@naderman.de>2010-03-18 22:10:31 +0100
commitc6870ac3feb8e911e523f3935621fc89585d26cd (patch)
tree4c7e3ec229a09d28b64b219c6d7e057cf20dc5d3 /phpBB/includes
parent5193160546625b6378deda8c0028a861f0760292 (diff)
parentd07e152ea7e820c5a0e47aeb8004fa0b5621a314 (diff)
downloadforums-c6870ac3feb8e911e523f3935621fc89585d26cd.tar
forums-c6870ac3feb8e911e523f3935621fc89585d26cd.tar.gz
forums-c6870ac3feb8e911e523f3935621fc89585d26cd.tar.bz2
forums-c6870ac3feb8e911e523f3935621fc89585d26cd.tar.xz
forums-c6870ac3feb8e911e523f3935621fc89585d26cd.zip
Merge branch 'bug/cs278/58025' into develop-olympus
* bug/cs278/58025: [bug/58025] Search robots are now redirected if they send a SID in the request Conflicts: phpBB/docs/CHANGELOG.html
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/session.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 1a302d5991..8beb0161f9 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -608,6 +608,12 @@ 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;
}