Skip to content
This repository
Browse code

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...
commit c1bb9700f94307f7ec0af610dbaa53db7516fbf8 1 parent d2245fd
authored July 21, 2009

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  cake/dispatcher.php
4  cake/dispatcher.php
@@ -515,10 +515,10 @@ function uri() {
515 515
 				parse_str($uri[1], $_GET);
516 516
 			}
517 517
 			$uri = $uri[0];
518  
-		} elseif (empty($uri) && is_string(env('QUERY_STRING'))) {
  518
+		} else {
519 519
 			$uri = env('QUERY_STRING');
520 520
 		}
521  
-		if (strpos($uri, 'index.php') !== false) {
  521
+		if (is_string($uri) && strpos($uri, 'index.php') !== false) {
522 522
 			list(, $uri) = explode('index.php', $uri, 2);
523 523
 		}
524 524
 		if (empty($uri) || $uri == '/' || $uri == '//') {

0 notes on commit c1bb970

Please sign in to comment.
Something went wrong with that request. Please try again.