mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-10-11 21:00:38 +02:00
parent 0e6a0aae8f 2c01fe67e9
commit d64ce15ecf
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/functions.php
View File

@@ -1632,7 +1632,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;
@@ -1649,7 +1649,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')