From d022bc0ed8cf733b7f41ea9578ad4388c352a837 Mon Sep 17 00:00:00 2001 From: acydburn Date: Fri, 1 Aug 2008 14:30:42 +0000 Subject: [PATCH] merge cookie secure detection git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8738 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ee39bde5d..15936d209 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) -- 2.11.4.GIT