Merge branch 'master' of dim0x69/tt-rss into master

[tt-rss.git] / install / index.php

diff --git a/install/index.php b/install/index.php
index 4239f5893f949e84f84a9de47538204cf1f8bbcd..9f817db1790d6da4dd3e834170f62d1e22b21cd8 100755 (executable)
--- a/install/index.php
+++ b/install/index.php
@@ -3,7 +3,7 @@
        <title>Tiny Tiny RSS - Installer</title>
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
        <link rel="stylesheet" type="text/css" href="../css/utility.css">
-       <link rel="stylesheet" type="text/css" href="../css/dijit.css">
+       <link rel="stylesheet" type="text/css" href="../css/default.css">
        <style type="text/css">
        textarea { font-size : 12px; }
        </style>
@@ -180,7 +180,7 @@
        }
 
        function is_server_https() {
-               return $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
+               return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
        }
 
        function make_self_url_path() {