Index: branches/5.3.x/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r15974 -r15999 --- branches/5.3.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 15974) +++ branches/5.3.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 15999) @@ -1,6 +1,6 @@ Application->isAdmin ? $this->Application->ConfigValue('AdminSSL_URL') : false; + $ssl_domain = $this->Application->getSecureDomain(); - if ( !$ssl ) { - // not in admin or admin ssl url is empty - $ssl_url = $this->Application->siteDomainField('SSLUrl'); - $ssl = $ssl_url !== false ? $ssl_url : $this->Application->ConfigValue('SSL_URL'); - } - - if ( !$ssl || ($this->Application->TemplatesCache->forceThemeName !== false) ) { + if ( !$ssl_domain || ($this->Application->TemplatesCache->forceThemeName !== false) ) { // SSL URL is not set - no way to require SSL // internal parsing (e.g. "TemplateParser::_parseTemplate") -> don't redirect return;