aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-03-08 11:07:16 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-03-08 11:07:16 +0000
commitde352a469c472b981f6949334088679b2d497c3f (patch)
tree010852051955bfa0899c273984ac92f88bc4754b
parentfc0b390e2579417eda23e2e8d4bfc49d4fc209d8 (diff)
downloadelgg-de352a469c472b981f6949334088679b2d497c3f.tar.gz
elgg-de352a469c472b981f6949334088679b2d497c3f.tar.bz2
Configuration fix
git-svn-id: https://code.elgg.org/elgg/trunk@116 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/configuration.php12
-rw-r--r--mod/test/index.php9
2 files changed, 15 insertions, 6 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 6b2bfbb49..138b4b796 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);
}
diff --git a/mod/test/index.php b/mod/test/index.php
new file mode 100644
index 000000000..e502ae790
--- /dev/null
+++ b/mod/test/index.php
@@ -0,0 +1,9 @@
+<?php
+
+ require_once("../../engine/start.php");
+
+ global $CONFIG;
+
+ var_export($CONFIG);
+
+?> \ No newline at end of file