summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-14 02:16:44 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-14 02:16:44 +0200
commita8262ba2fe0e11302b8d81e1afba71d4f96cd6d7 (patch)
tree71cccdf22b4ed90e18e88665c628bb5b52b1e56e /system/core
parentd163e0b219b8afacea3cd0d1d7c2ce5bb6f8a933 (diff)
Diffstat (limited to 'system/core')
-rw-r--r--system/core/URI.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/URI.php b/system/core/URI.php
index 2e661ed4c..ef1a12650 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -189,11 +189,11 @@ class CI_URI {
return '';
}
- if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)
+ if (strpos($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']) === 0)
{
- $uri = substr($uri, strlen($_SERVER['SCRIPT_NAME']));
+ $uri = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
}
- elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
+ elseif (strpos($_SERVER['REQUEST_URI'], dirname($_SERVER['SCRIPT_NAME'])) === 0)
{
$uri = substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
}