diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-16 12:09:37 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-16 12:09:37 +0000 |
| commit | da402759abce838f891961a296ab719e5a5516a9 (patch) | |
| tree | 74390644d5b2624055bd31897a0937462d6c5362 | |
| parent | 619be99cf48c0486464589a482d6fec2b40ede83 (diff) | |
| download | forums-da402759abce838f891961a296ab719e5a5516a9.tar forums-da402759abce838f891961a296ab719e5a5516a9.tar.gz forums-da402759abce838f891961a296ab719e5a5516a9.tar.bz2 forums-da402759abce838f891961a296ab719e5a5516a9.tar.xz forums-da402759abce838f891961a296ab719e5a5516a9.zip | |
gah, thanks chris. :)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8850 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/session.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index ab86ad11ce..780c6b9e14 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -214,15 +214,8 @@ class session $this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : ''; $this->referer = (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : ''; $this->forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : ''; -<<<<<<< .mine - $this->host = $this->get_validated_hostname(); -======= ->>>>>>> .r8847 -<<<<<<< .mine -======= $this->host = $this->extract_current_hostname(); ->>>>>>> .r8847 $this->page = $this->extract_current_page($phpbb_root_path); // if the forwarded for header shall be checked we have to validate its contents |