Permalink
Browse files

fixes #6509, dispatcher uri error on IIS

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8237 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
gwoo
gwoo committed Jul 21, 2009
1 parent d2245fd commit c1bb9700f94307f7ec0af610dbaa53db7516fbf8
Showing with 2 additions and 2 deletions.
  1. +2 −2 cake/dispatcher.php
View
@@ -515,10 +515,10 @@ function uri() {
parse_str($uri[1], $_GET);
}
$uri = $uri[0];
- } elseif (empty($uri) && is_string(env('QUERY_STRING'))) {
+ } else {
$uri = env('QUERY_STRING');
}
- if (strpos($uri, 'index.php') !== false) {
+ if (is_string($uri) && strpos($uri, 'index.php') !== false) {
list(, $uri) = explode('index.php', $uri, 2);
}
if (empty($uri) || $uri == '/' || $uri == '//') {

0 comments on commit c1bb970

Please sign in to comment.