Merge branch 'ticket-12487-HTTPS' into develop

This commit is contained in:
Marion Muszynski 2017-03-08 17:51:22 +01:00
commit e554592f77

View File

@ -32,9 +32,9 @@ class Link extends LinkCore
public function getPageLink($filename, $ssl = false, $id_lang = NULL)
{
if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PORT'] == '443') {
return $this->getPageLinkSsl($filename, $ssl = false, $id_lang = NULL);
return $this->getPageLinkSsl($filename, $ssl, $id_lang);
} else {
return parent::getPageLink($filename, $ssl = false, $id_lang = NULL);
return parent::getPageLink($filename, $ssl, $id_lang);
}
}