more ssl_policy cleanup, allow manual feed update per contact when hub is whacked...

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index bb7819fdec38149e9bd5794b0ef33500c6e9f9e1..6cbb4f07c7200da51d3305c42e4d85e10cf427c6 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -283,10 +283,12 @@ class App {
 
                $scheme = $this->scheme;
 
-               if(($ssl) || ($a->config['ssl_policy'] == SSL_POLICY_FULL)) 
-                       $scheme = 'https';
-               if(($a->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
-                       $scheme = 'https';
+               if(x($this->config,'ssl_policy')) {
+                       if(($ssl) || ($this->config['ssl_policy'] == SSL_POLICY_FULL)) 
+                               $scheme = 'https';
+                       if(($this->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
+                               $scheme = 'https';
+               }
 
                $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
                return $this->baseurl;