Changeset 11980 for trunk/wp-includes/feed.php

Timestamp:

09/28/2009 02:36:48 PM (17 years ago)

Author:

ryan

Message:

Deprecates the_content_rss(). Add the_content_feed() and get_the_content_feed(). Convert places that called the_content_rss() with an excerpt length to the_excerpt_rss(). Remove the rss_excerpt_length option. Use the_content_feed() where the_content() was previously used in feeds. Props Viper007Bond.

File:

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

trunk/wp-includes/feed.php

@@ -131 +131 @@
 
 /**
- * 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.
- *
- * @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.
- */
-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;
-                }
-
-                /** @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;
-        }
+ * Retrieve 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 get_the_content_feed($feed_type = null) {
+        if ( !$feed_type )
+                $feed_type = get_default_feed();
+
+        $content = apply_filters('the_content', get_the_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();
 }