From 08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Mon, 12 Sep 2005 09:56:20 +0000
Subject: WP Merge

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

(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 770f848..3219462 100644
--- a/wp-inst/wp-includes/classes.php
+++ b/wp-inst/wp-includes/classes.php
@@ -1365,7 +1365,7 @@ class WP {
 
 				// The requested permalink is in $pathinfo for path info requests and
 				//  $req_uri for other requests.
-				if (! empty($pathinfo)) {
+				if (! empty($pathinfo) && ($wp_rewrite->index != $pathinfo)) {
 					$request = $pathinfo;
 				} else {
 					$request = $req_uri;
-- 
cgit