summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/classes.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-12 09:56:20 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-12 09:56:20 +0000
commit08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d (patch)
treea1bfc6794fd6391ab18cde2be9ab7d5fdb53a8f4 /wp-inst/wp-includes/classes.php
parentaa61097b2b86ec542ce29cc169f7686f555fb79c (diff)
downloadwordpress-mu-08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d.tar.gz
wordpress-mu-08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d.tar.xz
wordpress-mu-08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@310 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/classes.php')
-rw-r--r--wp-inst/wp-includes/classes.php2
1 files changed, 1 insertions, 1 deletions
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;