diff options
| author | icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-03-31 12:55:15 +0000 |
|---|---|---|
| committer | icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-03-31 12:55:15 +0000 |
| commit | 9e349a24a228680660e2be031783d5b9fcb253b0 (patch) | |
| tree | eef50d82c3b6bcd663ebc0abf69108235355bc1f | |
| parent | da83aa0dd9d4fcbb81a9c2f27cb43587f9225279 (diff) | |
| download | elgg-9e349a24a228680660e2be031783d5b9fcb253b0.tar.gz elgg-9e349a24a228680660e2be031783d5b9fcb253b0.tar.bz2 | |
Marcus Povey <marcus@dushka.co.uk>
* Reverted regression
git-svn-id: https://code.elgg.org/elgg/trunk@293 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/configuration.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index 43b01e88e..6b2bfbb49 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,14 +37,16 @@ $CONFIG->wwwroot .= "/";
}*/ - //$request = $_SERVER['REQUEST_URI'];
- $request = str_replace($_SERVER['DOCUMENT_ROOT'],'',$CONFIG->path); + $request = $_SERVER['REQUEST_URI']; + 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); }
@@ -55,7 +57,7 @@ $CONFIG->sitename = "New Elgg site";
if (empty($CONFIG->debug))
- $CONFIG->debug = false;
+ $CONFIG->debug = false; }
|