aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-03-17 10:38:18 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-03-17 10:38:18 +0000
commit6b3108197983f196f6fbbd95ec2809a4ff4105b1 (patch)
tree11e14ba068af12d66188cd50efd78cc480a8ab10
parent31f8c77e0faea5b6ac7c9d37830a77be575676d4 (diff)
downloadelgg-6b3108197983f196f6fbbd95ec2809a4ff4105b1.tar.gz
elgg-6b3108197983f196f6fbbd95ec2809a4ff4105b1.tar.bz2
Marcus Povey <marcus@dushka.co.uk>
* Reverted regression caused by previous revision git-svn-id: https://code.elgg.org/elgg/trunk@234 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/configuration.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 138b4b796..6b2bfbb49 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -33,10 +33,10 @@
if (empty($CONFIG->wwwroot)) {
$CONFIG->wwwroot = "http://" . $_SERVER['SERVER_NAME'];
- if (strripos($_SERVER['DOCUMENT_ROOT'],"/") < (strlen($_SERVER['DOCUMENT_ROOT']) - 1)) {
- //$CONFIG->wwwroot .= "/";
- }
- /*
+ /*if (strripos($_SERVER['DOCUMENT_ROOT'],"/") < (strlen($_SERVER['DOCUMENT_ROOT']) - 1)) {
+ $CONFIG->wwwroot .= "/";
+ }*/
+
$request = $_SERVER['REQUEST_URI'];
if (strripos($request,"/") < (strlen($request) - 1)) {
@@ -45,8 +45,8 @@
}
$CONFIG->wwwroot .= $request;
- */
- $CONFIG->wwwroot .= str_replace($_SERVER['DOCUMENT_ROOT'],"",$CONFIG->path);
+
+ //$CONFIG->wwwroot .= str_replace($_SERVER['DOCUMENT_ROOT'],"",$CONFIG->path);
}