summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/classes.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-12-01 15:28:34 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-12-01 15:28:34 +0000
commitca460de5458e35b012e643b2af4880312c06d0f6 (patch)
treeebe8e430f2a863ae7b6671ea3e51ff1eaee0bb7a /wp-inst/wp-includes/classes.php
parent814b39931c8ff188122ba77b78388b4fbe7008df (diff)
downloadwordpress-mu-ca460de5458e35b012e643b2af4880312c06d0f6.tar.gz
wordpress-mu-ca460de5458e35b012e643b2af4880312c06d0f6.tar.xz
wordpress-mu-ca460de5458e35b012e643b2af4880312c06d0f6.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@454 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/classes.php')
-rw-r--r--wp-inst/wp-includes/classes.php4
1 files changed, 4 insertions, 0 deletions
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.