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
cakephp · Jul 21, 2009 · c1bb970 · c1bb970
1 parent d2245fd
commit c1bb970
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
@@ -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 == '//') {