X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/0459461f9ea42e0b090759ff6fe5f48360bef750..refs/tags/wordpress-4.5:/wp-includes/feed.php

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 4842c6e1..feb690d8 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -622,6 +622,8 @@ function self_link() {
  * Return the content type for specified feed type.
  *
  * @since 2.8.0
+ *
+ * @param string $type Type of feed. Possible values include 'rss', rss2', 'atom', and 'rdf'.
  */
 function feed_content_type( $type = '' ) {
 	if ( empty($type) )
@@ -630,7 +632,6 @@ function feed_content_type( $type = '' ) {
 	$types = array(
 		'rss'  => 'application/rss+xml',
 		'rss2' => 'application/rss+xml',
-		'rss-http'  => 'text/xml',
 		'atom' => 'application/atom+xml',
 		'rdf'  => 'application/rdf+xml'
 	);
@@ -643,8 +644,7 @@ function feed_content_type( $type = '' ) {
 	 * @since 2.8.0
 	 *
 	 * @param string $content_type Content type indicating the type of data that a feed contains.
-	 * @param string $type         Type of feed. Possible values include 'rss2', 'atom'.
-	 *                             Default 'rss2'.
+	 * @param string $type         Type of feed. Possible values include 'rss', rss2', 'atom', and 'rdf'.
 	 */
 	return apply_filters( 'feed_content_type', $content_type, $type );
 }