Wordpress 3.0.6-scripts

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

diff --git a/wp-includes/feed-rdf.php b/wp-includes/feed-rdf.php
index 9be83012e5b3d411b398d7e6e61a5db8cc40fc17..3a0daf1fd63a7181e70c37c039d172d97a314b11 100644 (file)
--- a/wp-includes/feed-rdf.php
+++ b/wp-includes/feed-rdf.php
@@ -5,11 +5,10 @@
  * @package WordPress
  */
 
  * @package WordPress
  */
 

-header('Content-Type: application/rdf+xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);

 $more = 1;
 
 $more = 1;
 

-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rdf:RDF
        xmlns="http://purl.org/rss/1.0/"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 <rdf:RDF
        xmlns="http://purl.org/rss/1.0/"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"


@@ -24,9 +23,8 @@ $more = 1;
        <link><?php bloginfo_rss('url') ?></link>
        <description><?php bloginfo_rss('description') ?></description>
        <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date>
        <link><?php bloginfo_rss('url') ?></link>
        <description><?php bloginfo_rss('description') ?></description>
        <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date>

-       <?php the_generator( 'rdf' ); ?>
-       <sy:updatePeriod>hourly</sy:updatePeriod>
-       <sy:updateFrequency>1</sy:updateFrequency>
+       <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
+       <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>

        <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
        <?php do_action('rdf_header'); ?>
        <items>
        <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
        <?php do_action('rdf_header'); ?>
        <items>


@@ -47,8 +45,8 @@ $more = 1;
 <?php if (get_option('rss_use_excerpt')) : ?>
        <description><?php the_excerpt_rss() ?></description>
 <?php else : ?>
 <?php if (get_option('rss_use_excerpt')) : ?>
        <description><?php the_excerpt_rss() ?></description>
 <?php else : ?>

-       <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length'), 2) ?></description>
-       <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
+       <description><?php the_excerpt_rss() ?></description>
+       <content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>

 <?php endif; ?>
        <?php do_action('rdf_item'); ?>
 </item>
 <?php endif; ?>
        <?php do_action('rdf_item'); ?>
 </item>