Changeset 37284

Timestamp:

04/21/2016 07:28:00 PM (8 years ago)

Author:

johnbillion

Message:

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.

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• src/wp-includes/feed.php (modified) (1 diff)

branches/4.5/src/wp-includes/feed.php

@@ -631 +631 @@
 
     $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'
     );