Merge pull request #1387 from mexon/mat/mergerequest

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 45d1599692246715208fc0f886ba7889be0a998a..5dcb9a54a0da070f7e606c3c3b3862cf7a034c78 100644 (file)
--- a/index.php
+++ b/index.php
@@ -53,8 +53,8 @@ if(!$install) {
        load_config('config');
        load_config('system');
 
-       if ((intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
-               ($a->get_scheme() == "http") AND
+       if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND
+               (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
                (substr($a->get_baseurl(), 0, 8) == "https://")) {
                header("HTTP/1.1 302 Moved Temporarily");
                header("location: ".$a->get_baseurl()."/".$a->query_string);