From da402759abce838f891961a296ab719e5a5516a9 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 16 Sep 2008 12:09:37 +0000 Subject: gah, thanks chris. :) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8850 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/session.php | 7 ------- 1 file changed, 7 deletions(-) (limited to 'phpBB/includes') 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 -- cgit v1.2.1