Installer redirects to HTTPS if ssl is set to 'always'

diff --git a/lib/installer.php b/lib/installer.php
index bf30d00786261c7f72d48a9263f9f40c0177f30b..bfe8c5259fbf447c2d518dbbeda2b2c37aa9b280 100644 (file)
--- 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(