diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-16 11:41:00 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-16 11:41:00 +0000 |
| commit | 619be99cf48c0486464589a482d6fec2b40ede83 (patch) | |
| tree | 842157f3351bdd437eb8a6963aa84053569f153e /phpBB/includes/session.php | |
| parent | bca5a953de32e29e7af6966fc928df043cad6bcd (diff) | |
| download | forums-619be99cf48c0486464589a482d6fec2b40ede83.tar forums-619be99cf48c0486464589a482d6fec2b40ede83.tar.gz forums-619be99cf48c0486464589a482d6fec2b40ede83.tar.bz2 forums-619be99cf48c0486464589a482d6fec2b40ede83.tar.xz forums-619be99cf48c0486464589a482d6fec2b40ede83.zip | |
add missing dot. :)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8848 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 3ce68f36cf..ab86ad11ce 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -177,7 +177,7 @@ class session } else if (!empty($config['cookie_domain'])) { - $host = (strpos($config['cookie_domain']) === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain']; + $host = (strpos($config['cookie_domain'], '.') === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain']; } else { @@ -214,8 +214,15 @@ 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 |