WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / feed.php

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 4842c6e1a2ed4404925f904aa0d81dcf16749f8e..feb690d8dac9c66d9018e71183ceeef0f031b7f5 100644 (file)
--- 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
  * 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) )
  */
 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',
        $types = array(
                'rss'  => 'application/rss+xml',
                'rss2' => 'application/rss+xml',

-               'rss-http'  => 'text/xml',

                'atom' => 'application/atom+xml',
                'rdf'  => 'application/rdf+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.
         * @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 );
 }
         */
        return apply_filters( 'feed_content_type', $content_type, $type );
 }