golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure the rewrite rules for the feed files match when WordPress is installed in a subdirectory. See #6460 this is for trunk. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-03-30 13:42:03 +00:00
parent 9eeb25a302
commit 88cbd04406
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/rewrite.php
View File

@ -793,12 +793,12 @@ class WP_Rewrite {
$robots_rewrite = array('robots.txt$' => $this->index . '?robots=1'); $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 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', $default_feeds = array( '.*/wp-atom.php$' => $this->index .'?feed=atom',
'wp-rdf.php$' => $this->index .'?feed=rdf', '.*/wp-rdf.php$' => $this->index .'?feed=rdf',
'wp-rss.php$' => $this->index .'?feed=rss', '.*/wp-rss.php$' => $this->index .'?feed=rss',
'wp-rss2.php$' => $this->index .'?feed=rss2', '.*/wp-rss2.php$' => $this->index .'?feed=rss2',
'wp-feed.php$' => $this->index .'?feed=feed', '.*/wp-feed.php$' => $this->index .'?feed=feed',
'wp-commentsrss2.php$' => $this->index . '?feed=rss2&withcomments=1'); '.*/wp-commentsrss2.php$' => $this->index . '?feed=rss2&withcomments=1');
// Post // Post
$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK); $post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);

2
wp-includes/version.php
View File

@ -16,6 +16,6 @@ $wp_version = '2.6-bleeding';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 7558; $wp_db_version = 7574;
?> ?>