Wordpress 2.8.4-scripts

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

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index ad730f3817c84ce9576479f5fc937c03caf8177f..0226356419faa040de7997cf980f95076eec8ca3 100644 (file)
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -165,7 +165,7 @@ function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file
        if ( $cut && !$encode_html )
                $encode_html = 2;
        if ( 1== $encode_html ) {
-               $content = wp_specialchars($content);
+               $content = esc_html($content);
                $cut = 0;
        } elseif ( 0 == $encode_html ) {
                $content = make_url_footnote($content);
@@ -255,7 +255,7 @@ function get_comment_guid($comment_id = null) {
  * @since 1.5.0
  */
 function comment_link() {
-       echo clean_url( get_comment_link() );
+       echo esc_url( get_comment_link() );
 }
 
 /**
@@ -336,11 +336,11 @@ function get_the_category_rss($type = 'rss') {
 
        foreach ( $cat_names as $cat_name ) {
                if ( 'rdf' == $type )
-                       $the_list .= "\n\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
+                       $the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
                elseif ( 'atom' == $type )
-                       $the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', attribute_escape( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), attribute_escape( $cat_name ) );
+                       $the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), esc_attr( $cat_name ) );
                else
-                       $the_list .= "\n\t\t<category><![CDATA[" . html_entity_decode( $cat_name ) . "]]></category>\n";
+                       $the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
        }
 
        return apply_filters('the_category_rss', $the_list, $type);
@@ -403,10 +403,10 @@ function rss_enclosure() {
        foreach ( (array) get_post_custom() as $key => $val) {
                if ($key == 'enclosure') {
                        foreach ( (array) $val as $enc ) {
-                               $enclosure = split("\n", $enc);
+                               $enclosure = explode("\n", $enc);
 
                                //only get the the first element eg, audio/mpeg from 'audio/mpeg mpga mp2 mp3'
-                               $t = split('[ \t]', trim($enclosure[2]) );
+                               $t = preg_split('/[ \t]/', trim($enclosure[2]) );
                                $type = $t[0];
 
                                echo apply_filters('rss_enclosure', '<enclosure url="' . trim(htmlspecialchars($enclosure[0])) . '" length="' . trim($enclosure[1]) . '" type="' . $type . '" />' . "\n");
@@ -503,7 +503,7 @@ function prep_atom_text_construct($data) {
 function self_link() {
        $host = @parse_url(get_option('home'));
        $host = $host['host'];
-       echo clean_url(
+       echo esc_url(
                'http'
                . ( (isset($_SERVER['https']) && $_SERVER['https'] == 'on') ? 's' : '' ) . '://'
                . $host
@@ -511,4 +511,51 @@ function self_link() {
                );
 }
 
-?>
+/**
+ * Return the content type for specified feed type.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.8.0
+ */
+function feed_content_type( $type = '' ) {
+       if ( empty($type) )
+               $type = get_default_feed();
+
+       $types = array(
+               'rss'  => 'application/rss+xml',
+               'rss2' => 'application/rss+xml',
+               'rss-http'  => 'text/xml',
+               'atom' => 'application/atom+xml',
+               'rdf'  => 'application/rdf+xml'
+       );
+
+       $content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
+
+       return apply_filters( 'feed_content_type', $content_type, $type );
+}
+
+/**
+ * Build SimplePie object based on RSS or Atom feed from URL.
+ *
+ * @since 2.8
+ *
+ * @param string $url URL to retrieve feed
+ * @return WP_Error|SimplePie WP_Error object on failure or SimplePie object on success
+ */
+function fetch_feed($url) {
+       require_once (ABSPATH . WPINC . '/class-feed.php');
+
+       $feed = new SimplePie();
+       $feed->set_feed_url($url);
+       $feed->set_cache_class('WP_Feed_Cache');
+       $feed->set_file_class('WP_SimplePie_File');
+       $feed->set_cache_duration(apply_filters('wp_feed_cache_transient_lifetime', 43200));
+       $feed->init();
+       $feed->handle_content_type();
+
+       if ( $feed->error() )
+               return new WP_Error('simplepie-error', $feed->error());
+
+       return $feed;
+}