Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7148adcc0b
@ -1397,12 +1397,7 @@ class PMA_Config
|
||||
}
|
||||
|
||||
// Reconstruct URL using parsed parts
|
||||
if ($this->get('SSLPort')) {
|
||||
$port_number = $this->get('SSLPort');
|
||||
} else {
|
||||
$port_number = 443;
|
||||
}
|
||||
return 'https://' . $parsed['host'] . ':' . $port_number . $parsed['path'];
|
||||
return 'https://' . $parsed['host'] . ':443' . $parsed['path'];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
Reference in New Issue
Block a user