From 952b6873e76022522f3df918b820412efd109059 Mon Sep 17 00:00:00 2001
From: Ryan McCue <me@ryanmccue.info>
Date: Thu, 5 Jan 2017 03:06:42 +0000
Subject: [PATCH] Feeds: Don't override the Content-Type header inside
 fetc_feed()

SimplePie can set the Content-Type header automatically with the correct charset for convenience, but we already force the charset to match the site's, making it redundant at best. At worst, SimplePie incorrectly overrides the content-type for non-HTML content (such as API requests).

Props dlh, stevenkword.
Fixes #39066.

Built from https://develop.svn.wordpress.org/trunk@39681


git-svn-id: http://core.svn.wordpress.org/trunk@39621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/feed.php    | 1 -
 wp-includes/version.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index e6686c040e..dbeb3a0f83 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -702,7 +702,6 @@ function fetch_feed( $url ) {
 	do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
 	$feed->init();
 	$feed->set_output_encoding( get_option( 'blog_charset' ) );
-	$feed->handle_content_type();
 
 	if ( $feed->error() )
 		return new WP_Error( 'simplepie-error', $feed->error() );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b0acdf20fe..6b86d29c15 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-39680';
+$wp_version = '4.8-alpha-39681';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.