Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-18 14:21:25 +01:00
Code Issues 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.

Browse Source 
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
This commit is contained in:
John Blackbourn 2016-04-21 18:57:28 +00:00
parent cf12011934
commit a58ec423da
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/feed.php
View File

@ -630,10 +630,11 @@ function feed_content_type( $type = '' ) {
$type = get_default_feed(); $type = get_default_feed();
$types = array( $types = array(
'rss' => 'application/rss+xml', 'rss' => 'application/rss+xml',
'rss2' => 'application/rss+xml', 'rss2' => 'application/rss+xml',
'atom' => 'application/atom+xml', 'rss-http' => 'text/xml',
'rdf' => 'application/rdf+xml' 'atom' => 'application/atom+xml',
'rdf' => 'application/rdf+xml'
); );
$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream'; $content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.