Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix feed autodiscovery. Props peaceablewhale. fixes #9810 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-05-16 05:15:21 +00:00
parent e8b025b971
commit a5e73d3b9b
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/feed-rss.php
View File

@ -5,7 +5,7 @@
* @package WordPress
*/
header('Content-Type: ' . feed_content_type('rss') . '; charset=' . get_option('blog_charset'), true);
header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
$more = 1;
echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

2
wp-includes/feed-rss2-comments.php
View File

@ -5,7 +5,7 @@
* @package WordPress
*/
header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
?>

2
wp-includes/feed-rss2.php
View File

@ -5,7 +5,7 @@
* @package WordPress
*/
header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
$more = 1;
echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

7
wp-includes/feed.php
View File

@ -523,10 +523,11 @@ function feed_content_type( $type = '' ) {
$type = get_default_feed();
$types = array(
'rss' => 'text/xml',
'rss2' => 'text/xml',
'rss' => 'application/rss+xml',
'rss2' => 'application/rss+xml',
'rss-http' => 'text/xml',
'atom' => 'application/atom+xml',
'rdf' => 'application/rdf+xml',
'rdf' => 'application/rdf+xml'
);
$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';