diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-01-08 23:24:32 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-01-08 23:24:32 +0100 |
| commit | 2425f2f90331a014d3b276629089135fbd849a42 (patch) | |
| tree | 12b8c710384aaed67dfb048c5dc1d5e74d1e2fec /system/core/URI.php | |
| parent | 352d60e9f3a65def29e02a4507ef742eac255333 (diff) | |
| parent | 0609d588a4340fc9a9cfbc0ff76c39bba9ab09fb (diff) | |
Merge pull request #897 from IT-Can/develop-fixes-896
Fixes for issue #896
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']))); } |