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

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

Merges [37282] to the 4.5 branch.

Built from https://develop.svn.wordpress.org/branches/4.5@37284


git-svn-id: http://core.svn.wordpress.org/branches/4.5@37250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-04-21 19:28:28 +00:00
parent 02f7ebf6bd
commit ca63f2f7bc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/feed.php
View File

@ -632,6 +632,7 @@ function feed_content_type( $type = '' ) {
$types = array( $types = array(
'rss' => 'application/rss+xml', 'rss' => 'application/rss+xml',
'rss2' => 'application/rss+xml', 'rss2' => 'application/rss+xml',
'rss-http' => 'text/xml',
'atom' => 'application/atom+xml', 'atom' => 'application/atom+xml',
'rdf' => 'application/rdf+xml' 'rdf' => 'application/rdf+xml'
); );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5.1-alpha-37275'; $wp_version = '4.5.1-alpha-37284';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.