X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=ecbfb3eb7b1d692e46d47ba2ae50cfc9fa13a4c3;hb=1e89369ef8e13dc7fae66e22a127cf22732c204e;hp=a4beec9e5e8a7b08e4fa1bf10329a206b182bb91;hpb=f09202654194218d07c992b286790919e9dbae42;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index a4beec9e5e..ecbfb3eb7b 100644
--- a/index.php
+++ b/index.php
@@ -40,6 +40,12 @@
 $_startTime = microtime(true);
 $_perfCounters = array();
 
+// We provide all our dependencies through our own autoload.
+// This will probably be configurable for distributing with
+// system packages (like with Debian apt etc. where included
+// libraries are maintained through repositories)
+set_include_path('.');  // mainly fixes an issue where /usr/share/{pear,php*}/DB/DataObject.php is _old_ on various systems...
+
 define('INSTALLDIR', dirname(__FILE__));
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
@@ -260,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));
     }