diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6a36210dca..43d8cce3c4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1644,7 +1644,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false,  */  function generate_board_url($without_script_path = false)  { -	global $config, $user, $request; +	global $config, $user, $request, $symfony_request;  	$server_name = $user->host; @@ -1661,7 +1661,8 @@ function generate_board_url($without_script_path = false)  	}  	else  	{ -		$server_port = $request->server('SERVER_PORT', 0); +		$server_port = (int) $symfony_request->getPort(); +  		$forwarded_proto = $request->server('HTTP_X_FORWARDED_PROTO');  		if (!empty($forwarded_proto) && $forwarded_proto === 'https')  | 
