- Fixing Trac #188... new flag https_hyperlinks with a slightly different meaning: produce https hyperlinks even if the current page is NOT https.

SVN:trunk[671]
This commit is contained in:
Denis Flaven
2010-08-10 17:10:39 +00:00
parent 73458617bf
commit 9eba34362c
2 changed files with 27 additions and 3 deletions

View File

@@ -185,9 +185,10 @@ class utils
{
// Build an absolute URL to this page on this server/port
$sServerName = $_SERVER['SERVER_NAME'];
if (self::GetConfig()->GetSecureConnectionRequired())
if (self::GetConfig()->GetSecureConnectionRequired() || self::GetConfig()->GetHttpsHyperlinks())
{
// If a secure connection is required, then any URL must start with https !
// If a secure connection is required, or if the URL is requested to start with HTTPS
// then any URL must start with https !
$bForceHTTPS = true;
}
if ($bForceHTTPS)