- if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND
- (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) AND
- (substr(App::get_baseurl(), 0, 8) == "https://")) {
+ if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
+ (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
+ (substr(System::baseUrl(), 0, 8) == "https://")) {