Wordpress 2.9.2-scripts

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

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 0226356419faa040de7997cf980f95076eec8ca3..ebd392b116332a014acfb05c12ce6d093f5cc7b5 100644 (file)
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -130,66 +130,38 @@ function the_title_rss() {
 }
 
 /**
 }
 
 /**

- * Display the post content for the feed.
- *
- * For encoding the html or the $encode_html parameter, there are three possible
- * values. '0' will make urls footnotes and use make_url_footnote(). '1' will
- * encode special characters and automatically display all of the content. The
- * value of '2' will strip all HTML tags from the content.
- *
- * Also note that you cannot set the amount of words and not set the html
- * encoding. If that is the case, then the html encoding will default to 2,
- * which will strip all HTML tags.
- *
- * To restrict the amount of words of the content, you can use the cut
- * parameter. If the content is less than the amount, then there won't be any
- * dots added to the end. If there is content left over, then dots will be added
- * and the rest of the content will be removed.
+ * Retrieve the post content for feeds.

  *
  * @package WordPress
  * @subpackage Feed
  *
  * @package WordPress
  * @subpackage Feed

- * @since 0.71
- * @uses apply_filters() Calls 'the_content_rss' on the content before processing.
- * @see get_the_content() For the $more_link_text, $stripteaser, and $more_file
- *             parameters.
- *
- * @param string $more_link_text Optional. Text to display when more content is available but not displayed.
- * @param int|bool $stripteaser Optional. Default is 0.
- * @param string $more_file Optional.
- * @param int $cut Optional. Amount of words to keep for the content.
- * @param int $encode_html Optional. How to encode the content.
+ * @since 2.9.0
+ * @uses apply_filters() Calls 'the_content_feed' on the content before processing.
+ * @see get_the_content()
+ *
+ * @param string $feed_type The type of feed. rss2 | atom | rss | rdf

  */
  */

-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-       $content = get_the_content($more_link_text, $stripteaser, $more_file);
-       $content = apply_filters('the_content_rss', $content);
-       if ( $cut && !$encode_html )
-               $encode_html = 2;
-       if ( 1== $encode_html ) {
-               $content = esc_html($content);
-               $cut = 0;
-       } elseif ( 0 == $encode_html ) {
-               $content = make_url_footnote($content);
-       } elseif ( 2 == $encode_html ) {
-               $content = strip_tags($content);
-       }
-       if ( $cut ) {
-               $blah = explode(' ', $content);
-               if ( count($blah) > $cut ) {
-                       $k = $cut;
-                       $use_dotdotdot = 1;
-               } else {
-                       $k = count($blah);
-                       $use_dotdotdot = 0;
-               }
+function get_the_content_feed($feed_type = null) {
+       if ( !$feed_type )
+               $feed_type = get_default_feed();

 
 

-               /** @todo Check performance, might be faster to use array slice instead. */
-               for ( $i=0; $i<$k; $i++ )
-                       $excerpt .= $blah[$i].' ';
-               $excerpt .= ($use_dotdotdot) ? '...' : '';
-               $content = $excerpt;
-       }
+       $content = apply_filters('the_content', get_the_content());

        $content = str_replace(']]>', ']]&gt;', $content);
        $content = str_replace(']]>', ']]&gt;', $content);

-       echo $content;
+       return apply_filters('the_content_feed', $content, $feed_type);
+}
+
+/**
+ * Display the post content for feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.9.0
+ * @uses apply_filters() Calls 'the_content_feed' on the content before processing.
+ * @see get_the_content()
+ *
+ * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
+ */
+function the_content_feed($feed_type = null) {
+       echo get_the_content_feed();

 }
 
 /**
 }
 
 /**


@@ -311,10 +283,12 @@ function comment_text_rss() {
  * @since 2.1.0
  * @uses apply_filters()
  *
  * @since 2.1.0
  * @uses apply_filters()
  *

- * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.
+ * @param string $type Optional, default is the type returned by get_default_feed().

  * @return string All of the post categories for displaying in the feed.
  */
  * @return string All of the post categories for displaying in the feed.
  */

-function get_the_category_rss($type = 'rss') {
+function get_the_category_rss($type = null) {
+       if ( empty($type) )
+               $type = get_default_feed();

        $categories = get_the_category();
        $tags = get_the_tags();
        $the_list = '';
        $categories = get_the_category();
        $tags = get_the_tags();
        $the_list = '';


@@ -354,9 +328,9 @@ function get_the_category_rss($type = 'rss') {
  * @since 0.71
  * @see get_the_category_rss() For better explanation.
  *
  * @since 0.71
  * @see get_the_category_rss() For better explanation.
  *

- * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.
+ * @param string $type Optional, default is the type returned by get_default_feed().

  */
  */

-function the_category_rss($type = 'rss') {
+function the_category_rss($type = null) {

        echo get_the_category_rss($type);
 }
 
        echo get_the_category_rss($type);
 }