summaryrefslogtreecommitdiffstats
path: root/wp-includes/rewrite.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-10 14:08:54 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-10 14:08:54 +0000
commit310940b824eff4a116dcd72ccd339bb602021981 (patch)
tree19f6efc7b30b9456eebc26d578c5dc7e125bb6e7 /wp-includes/rewrite.php
parent616f7399dc4c4f7c56951c7b87a7aa91b3e690a3 (diff)
downloadwordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.tar.gz
wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.tar.xz
wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.zip
Merge with branches/2.5 in WordPress, revision 8066
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/rewrite.php')
-rw-r--r--wp-includes/rewrite.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 2229497..176eee0 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);