From 2f708663679eb549568f9ad3722885297a587020 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 18 Oct 2013 18:17:37 +0200
Subject: [PATCH] Installer redirects to HTTPS if ssl is set to 'always'

---
 lib/installer.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index bf30d00786..bfe8c5259f 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -640,10 +640,8 @@ endforeach;
         // Set permissions back to something decent
         chmod(INSTALLDIR.'/config.php', 0644);
         
-        /*
-            TODO https needs to be considered
-        */
-        $link = "http://".$this->server.'/'.$this->path;
+        $scheme = $this->ssl === 'always' ? 'https' : 'http';
+        $link = "{$scheme}://{$this->server}/{$this->path}";
 
         $this->updateStatus("StatusNet has been installed at $link");
         $this->updateStatus(