Changeset 11358

Timestamp:

05/16/2009 05:15:21 AM (15 years ago)

Author:

ryan

Message:

Fix feed autodiscovery. Props peaceablewhale. fixes #9810

Location:

trunk/wp-includes

Files:

• feed-rss.php (modified) (1 diff)
• feed-rss2-comments.php (modified) (1 diff)
• feed-rss2.php (modified) (1 diff)
• feed.php (modified) (1 diff)

trunk/wp-includes/feed-rss.php

@@ -6 +6 @@
  */
 
-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;
 

trunk/wp-includes/feed-rss2-comments.php

@@ -6 +6 @@
  */
 
-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').'"?'.'>';

trunk/wp-includes/feed-rss2.php

@@ -6 +6 @@
  */
 
-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;
 

trunk/wp-includes/feed.php

@@ -524 +524 @@
 
     $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'
     );