Changeset 7843

Timestamp:

04/28/2008 06:20:53 AM (17 years ago)

Author:

westi

Message:

Make sure the direct feed files work when siteurl == homeurl. Fixes #6460 for the 2.5 branch props DD32.

Location:

branches/2.5/wp-includes

Files:

• rewrite.php (modified) (1 diff)
• version.php (modified) (1 diff)

branches/2.5/wp-includes/rewrite.php

@@ -794 +794 @@
 
         //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

branches/2.5/wp-includes/version.php

@@ -17 +17 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 7796;
+$wp_db_version = 7843;
 
 ?>