diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-10 21:04:29 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-10 21:04:29 +0100 |
| commit | 189a34ec0949c6e96c896b92a8b1ea09ae9f232c (patch) | |
| tree | ddb25a94de1095598e1b88bc2d082552cef392e5 /system/core/URI.php | |
| parent | 3c7c461a93145b045ba688585a5b606e28b7d7cb (diff) | |
| parent | b790371f328e49ed57eda85bf33817e033b85601 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/core/URI.php')
| -rwxr-xr-x | system/core/URI.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index eaf7b752b..b28ee198b 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -186,11 +186,12 @@ class CI_URI { return ''; } - if (strpos($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']) === 0) + $uri = $_SERVER['REQUEST_URI']; + if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0) { $uri = substr($uri, strlen($_SERVER['SCRIPT_NAME'])); } - elseif (strpos($_SERVER['REQUEST_URI'], dirname($_SERVER['SCRIPT_NAME'])) === 0) + elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0) { $uri = substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME']))); } |