Merge branch 'ticket-12487-HTTPS' into develop

This commit is contained in:
Marion Muszynski 2017-03-08 18:05:32 +01:00
commit 67d70b33e0

View File

@ -29,15 +29,6 @@ class Link extends LinkCore
return $base._MODULE_DIR_.'/'.Module::getModuleNameFromClass('AdminGuidePosts').'/';
}
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, $id_lang);
} else {
return parent::getPageLink($filename, $ssl, $id_lang);
}
}
public function getPageLinkSsl($filename, $ssl = false, $id_lang = NULL)
{
global $cookie;