diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-03-28 16:11:29 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-03-28 16:11:29 +0000 |
| commit | 9f97c6ca92329489509f86900e735a00bde4e56a (patch) | |
| tree | 40b850ac0a6f9997b13bea283cbeb508686cec17 /engine/lib | |
| parent | 3e69ba121f82526a7ff50a19287bf0a3fdecbcd4 (diff) | |
| download | elgg-9f97c6ca92329489509f86900e735a00bde4e56a.tar.gz elgg-9f97c6ca92329489509f86900e735a00bde4e56a.tar.bz2 | |
Autoconfiguration update .. again
git-svn-id: https://code.elgg.org/elgg/trunk@282 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
| -rw-r--r-- | engine/lib/configuration.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index 6b2bfbb49..43b01e88e 100644 --- a/engine/lib/configuration.php +++ b/engine/lib/configuration.php @@ -21,7 +21,7 @@ function set_default_config() {
global $CONFIG;
-
+
if (empty($CONFIG->path))
$CONFIG->path = str_replace("\\","/",dirname(dirname(dirname(__FILE__)))) . "/";
@@ -37,16 +37,14 @@ $CONFIG->wwwroot .= "/";
}*/ - $request = $_SERVER['REQUEST_URI']; - + //$request = $_SERVER['REQUEST_URI'];
+ $request = str_replace($_SERVER['DOCUMENT_ROOT'],'',$CONFIG->path); if (strripos($request,"/") < (strlen($request) - 1)) { // addressing a file directly, not a dir $request = substr($request, 0, strripos($request,"/")+1); } $CONFIG->wwwroot .= $request; -
- //$CONFIG->wwwroot .= str_replace($_SERVER['DOCUMENT_ROOT'],"",$CONFIG->path); }
@@ -57,7 +55,7 @@ $CONFIG->sitename = "New Elgg site";
if (empty($CONFIG->debug))
- $CONFIG->debug = false; + $CONFIG->debug = false;
}
|