From 045e94ccf3291c817bf1683b63682b1e0af74980 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 17 Jan 2017 19:33:06 +0000
Subject: [PATCH] Some more config stuff

---
 boot.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/boot.php b/boot.php
index a9b4e4d293..d598ef8666 100644
--- a/boot.php
+++ b/boot.php
@@ -825,24 +825,22 @@ class App {
 
 		$scheme = $this->scheme;
 
-		if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
-			if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
+		if (Config::get('system', 'ssl_policy') === SSL_POLICY_FULL) {
+			$scheme = 'https';
+		}
+
+		//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
+		//	(and also the login link). Anything seen by an outsider will have it turned off.
+
+		if (Config::get('system', 'ssl_policy') == SSL_POLICY_SELFSIGN) {
+			if ($ssl) {
 				$scheme = 'https';
-			}
-
-			//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
-			//	(and also the login link). Anything seen by an outsider will have it turned off.
-
-			if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
-				if ($ssl) {
-					$scheme = 'https';
-				} else {
-					$scheme = 'http';
-				}
+			} else {
+				$scheme = 'http';
 			}
 		}
 
-		if (get_config('config', 'hostname') != '') {
+		if (Config::get('config', 'hostname') != '') {
 			$this->hostname = get_config('config', 'hostname');
 		}