diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-01 14:30:42 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-01 14:30:42 +0000 |
| commit | 1071d9cb317dbc997f59f4eae3891d1dc4f3c53a (patch) | |
| tree | 46d587103723547b25143e2f56487769bae6a6ce /phpBB | |
| parent | 48701289fff7007472c14ef8dff0455242bab5c3 (diff) | |
| download | forums-1071d9cb317dbc997f59f4eae3891d1dc4f3c53a.tar forums-1071d9cb317dbc997f59f4eae3891d1dc4f3c53a.tar.gz forums-1071d9cb317dbc997f59f4eae3891d1dc4f3c53a.tar.bz2 forums-1071d9cb317dbc997f59f4eae3891d1dc4f3c53a.tar.xz forums-1071d9cb317dbc997f59f4eae3891d1dc4f3c53a.zip | |
merge cookie secure detection
git-svn-id: file:///svn/phpbb/trunk@8738 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ee39bde5dd..15936d2091 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1715,6 +1715,7 @@ function generate_board_url($without_script_path = false) $script_path = $config['script_path']; $url = $server_protocol . $server_name; + $cookie_secure = $config['cookie_secure']; } else { @@ -1725,7 +1726,7 @@ function generate_board_url($without_script_path = false) $script_path = $user->page['root_script_path']; } - if ($server_port && (($config['cookie_secure'] && $server_port <> 443) || (!$config['cookie_secure'] && $server_port <> 80))) + if ($server_port && (($cookie_secure && $server_port <> 443) || (!$cookie_secure && $server_port <> 80))) { // HTTP HOST can carry a port number (we fetch $user->host, but for old versions this may be true) if (strpos($server_name, ':') === false) |