From ca460de5458e35b012e643b2af4880312c06d0f6 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 1 Dec 2005 15:28:34 +0000
Subject: WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@454 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-inst/wp-includes/classes.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'wp-inst/wp-includes/classes.php')

diff --git a/wp-inst/wp-includes/classes.php b/wp-inst/wp-includes/classes.php
index 59de66d..9d3016f 100644
--- a/wp-inst/wp-includes/classes.php
+++ b/wp-inst/wp-includes/classes.php
@@ -1470,8 +1470,12 @@ class WP {
 			if ( ! empty($pathinfo) && ($wp_rewrite->index != $pathinfo) ) {
 				$request = $pathinfo;
 			} else {
+				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
+				if ( $req_uri == $wp_rewrite->index )
+					$req_uri = '';
 				$request = $req_uri;
 			}
+
 			$this->request = $request;
 
 			// Look for matches.
-- 
cgit