summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-02-18 15:36:59 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-02-18 15:36:59 +0100
commit9c023d4325d9b6cc1e9fd0eb9212763ffcf1a288 (patch)
treed6bc9d04386aaddd3433a722958dd7ce13a02a27 /system
parent3343f462766d110e8c15c6f52d1ef047418c2c98 (diff)
little tweak for ORIG_PATH_INFO servers so the URI isn't left with just a /
Diffstat (limited to 'system')
-rw-r--r--system/libraries/URI.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index b95c74e1a..e74af31f4 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -89,11 +89,11 @@ class CI_URI {
}
// No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists?
- $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO');
+ $path = str_replace($_SERVER['SCRIPT_NAME'], '', (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'));
if (trim($path, '/') != '' && $path != "/".SELF)
{
// remove path and script information so we have good URI data
- $this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path);
+ $this->uri_string = $path;
return;
}