summaryrefslogtreecommitdiff
path: root/src/SemanticScuttle/constants.php
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-05-12 19:25:03 +0200
committerChristian Weiske <cweiske@cweiske.de>2011-05-12 19:25:03 +0200
commit88d7b9631b444cef28115fb8e0bae736b45e557e (patch)
tree9c676c98dbface055c68df2731f3a7482dae465b /src/SemanticScuttle/constants.php
parentfc093a5fe51d35a2991e549e8836cac15dc2888b (diff)
parentb57c8d4581b05cd70a363cacd37f9ffc7da785d8 (diff)
downloadsemanticscuttle-88d7b9631b444cef28115fb8e0bae736b45e557e.tar.gz
semanticscuttle-88d7b9631b444cef28115fb8e0bae736b45e557e.tar.bz2
Merge branch 'master' into configurable-privacy2
Diffstat (limited to 'src/SemanticScuttle/constants.php')
-rw-r--r--src/SemanticScuttle/constants.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/SemanticScuttle/constants.php b/src/SemanticScuttle/constants.php
index b023840..f8567d9 100644
--- a/src/SemanticScuttle/constants.php
+++ b/src/SemanticScuttle/constants.php
@@ -41,7 +41,10 @@ if (!isset($GLOBALS['root'])) {
$rootTmp .= '/';
}
- define('ROOT', 'http://'. $_SERVER['HTTP_HOST'] . $rootTmp);
+ //we do not prepend http since we also want to support https connections
+ // "http" is not required; it's automatically determined by the browser
+ // depending on the current connection.
+ define('ROOT', '//'. $_SERVER['HTTP_HOST'] . $rootTmp);
} else {
define('ROOT', $GLOBALS['root']);
}