Changeset 33658

Timestamp:

08/20/2015 06:09:28 AM (9 years ago)

Author:

wonderboymusic

Message:

Ensure that feeds are served with the proper Content-Type HTTP header.

Props stevenkword.
Fixes #32024.

File:

• trunk/src/wp-includes/class-wp.php (modified) (1 diff)

trunk/src/wp-includes/class-wp.php

@@ -367 +367 @@
             $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
         } else {
+            // Set the correct content type for feeds
+            $type = $this->query_vars['feed'];
+            if ( 'feed' == $this->query_vars['feed'] ) {
+                $type = get_default_feed();
+            }
+            $headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
+
             // We're showing a feed, so WP is indeed the only thing that last changed
             if ( !empty($this->query_vars['withcomments'])