Split up source and source_link. Never trust HTML!

[quix0rs-gnu-social.git] / index.php

diff --git a/index.php b/index.php
index de57f1078dc407e2532ad58d1b81750ccf2a8c23..ecbfb3eb7b1d692e46d47ba2ae50cfc9fa13a4c3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -266,10 +266,8 @@ function main()
 
     $args = $r->map($path);
 
-    $site_ssl = common_config('site', 'ssl');
-
     // If the request is HTTP and it should be HTTPS...
-    if ($site_ssl != 'never' && !GNUsocial::isHTTPS() && common_is_sensitive($args['action'])) {
+    if (GNUsocial::useHTTPS() && !GNUsocial::isHTTPS()) {
         common_redirect(common_local_url($args['action'], $args));
     }