summaryrefslogtreecommitdiffstats
path: root/system/core/URI.php
diff options
context:
space:
mode:
authorMichiel Vugteveen <michiel@it-can.nl>2012-01-08 13:26:17 +0100
committerMichiel Vugteveen <michiel@it-can.nl>2012-01-08 13:26:17 +0100
commit0609d588a4340fc9a9cfbc0ff76c39bba9ab09fb (patch)
tree12b8c710384aaed67dfb048c5dc1d5e74d1e2fec /system/core/URI.php
parent352d60e9f3a65def29e02a4507ef742eac255333 (diff)
Fixes for issue 896
Diffstat (limited to 'system/core/URI.php')
-rwxr-xr-xsystem/core/URI.php5
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'])));
}