Skip to content

Commit

Permalink
Main url auto-filled field was hardcoded as http: easy to overlook th…
Browse files Browse the repository at this point in the history
…is when running installer via https.

This sets protocol to be the same as the installer page.
  • Loading branch information
torvista committed Aug 18, 2018
1 parent 9a82cc3 commit 8426f0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion htdocs/install/inc.php
Expand Up @@ -566,7 +566,7 @@ function detect_dolibarr_main_url_root()
$dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"];
} // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
else {
$proto = 'http';
$proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
if (!empty($_SERVER["HTTP_HOST"])) {
$serverport = $_SERVER["HTTP_HOST"];
} else {
Expand Down

0 comments on commit 8426f0e

Please sign in to comment.