From a58ec423da502c779e37ed0e3b944f2a765a385c Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Thu, 21 Apr 2016 18:57:28 +0000 Subject: [PATCH] Feeds: Revert [36230] which removed the `rss-http` feed content type. Removing this means that any feeds which are using this feed content type are now being served as `application/octet-stream` instead of `text/xml`. See #36620 Built from https://develop.svn.wordpress.org/trunk@37282 git-svn-id: http://core.svn.wordpress.org/trunk@37248 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/feed.php | 9 +++++---- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wp-includes/feed.php b/wp-includes/feed.php index feb690d8da..7b1f30c78a 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -630,10 +630,11 @@ function feed_content_type( $type = '' ) { $type = get_default_feed(); $types = array( - 'rss' => 'application/rss+xml', - 'rss2' => 'application/rss+xml', - 'atom' => 'application/atom+xml', - 'rdf' => 'application/rdf+xml' + 'rss' => 'application/rss+xml', + 'rss2' => 'application/rss+xml', + 'rss-http' => 'text/xml', + 'atom' => 'application/atom+xml', + 'rdf' => 'application/rdf+xml' ); $content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream'; diff --git a/wp-includes/version.php b/wp-includes/version.php index 5bb8192026..90d8739988 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37281'; +$wp_version = '4.6-alpha-37282'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.