Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-10-26 13:51:48 +02:00
commit 7148adcc0b

View File

@ -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'];
}
/**