diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-24 11:45:39 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-24 11:45:39 +0000 |
| commit | cf9f85dc8121a359d550ffa3b735fb48859eee88 (patch) | |
| tree | 9f90be15fc46163f5656f019f2a2866414b7c9f2 /wp-includes/rewrite.php | |
| parent | f10f9f5b05e23ce4c07479b094bd3ff4bbfd86d0 (diff) | |
| download | wordpress-mu-cf9f85dc8121a359d550ffa3b735fb48859eee88.tar.gz wordpress-mu-cf9f85dc8121a359d550ffa3b735fb48859eee88.tar.xz wordpress-mu-cf9f85dc8121a359d550ffa3b735fb48859eee88.zip | |
Merged with WP 2.5, revision 7806
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1260 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/rewrite.php')
| -rw-r--r-- | wp-includes/rewrite.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php index c984e50..2229497 100644 --- a/wp-includes/rewrite.php +++ b/wp-includes/rewrite.php @@ -793,12 +793,12 @@ class WP_Rewrite { $robots_rewrite = array('robots.txt$' => $this->index . '?robots=1'); //Default Feed rules - These are require to allow for the direct access files to work with permalink structure starting with %category% - $default_feeds = array( 'wp-atom.php$' => $this->index .'?feed=atom', - 'wp-rdf.php$' => $this->index .'?feed=rdf', - 'wp-rss.php$' => $this->index .'?feed=rss', - 'wp-rss2.php$' => $this->index .'?feed=rss2', - 'wp-feed.php$' => $this->index .'?feed=feed', - 'wp-commentsrss2.php$' => $this->index . '?feed=rss2&withcomments=1'); + $default_feeds = array( '.*/wp-atom.php$' => $this->index .'?feed=atom', + '.*/wp-rdf.php$' => $this->index .'?feed=rdf', + '.*/wp-rss.php$' => $this->index .'?feed=rss', + '.*/wp-rss2.php$' => $this->index .'?feed=rss2', + '.*/wp-feed.php$' => $this->index .'?feed=feed', + '.*/wp-commentsrss2.php$' => $this->index . '?feed=rss2&withcomments=1'); // Post $post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK); @@ -993,6 +993,8 @@ class WP_Rewrite { // Enable generic rules for pages if permalink structure doesn't begin with a wildcard. $structure = ltrim($this->permalink_structure, '/'); + if ( $this->using_index_permalinks() ) + $structure = ltrim($this->permalink_structure, $this->index . '/'); if ( 0 === strpos($structure, '%postname%') || 0 === strpos($structure, '%category%') || 0 === strpos($structure, '%tag%') || |