Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/index.php b/index.php
index de57f1078dc407e2532ad58d1b81750ccf2a8c23..f048d10c3cff264f144489995eb625311361a368 100644 (file)
--- a/index.php
+++ b/index.php
@@ -37,6 +37,9 @@
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
 
+// Comment in if you have xdebug installed and need a detailed backtrace:
+//xdebug_start_trace();
+
 $_startTime = microtime(true);
 $_perfCounters = array();
 
@@ -266,10 +269,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));
     }