Wordpress 2.9

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

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index f75e78466b537cc59d2dfe6a2cb88c810ddc7914..da3eeb467d811799f1fc0af4999f435c27de7527 100644 (file)
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -5,11 +5,10 @@
  * @package WordPress
  */
 
  * @package WordPress
  */
 

-header('Content-Type: application/atom+xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('atom') . '; 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').'"?'.'>'; ?>

 <feed
   xmlns="http://www.w3.org/2005/Atom"
   xmlns:thr="http://purl.org/syndication/thread/1.0"
 <feed
   xmlns="http://www.w3.org/2005/Atom"
   xmlns:thr="http://purl.org/syndication/thread/1.0"


@@ -20,7 +19,7 @@ $more = 1;
        <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
        <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
 
        <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
        <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
 

-       <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
+       <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>

        <?php the_generator( 'atom' ); ?>
 
        <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
        <?php the_generator( 'atom' ); ?>
 
        <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />


@@ -32,8 +31,8 @@ $more = 1;
        <entry>
                <author>
                        <name><?php the_author() ?></name>
        <entry>
                <author>
                        <name><?php the_author() ?></name>

-                       <?php $author_url = get_the_author_url(); if ( !empty($author_url) ) : ?>
-                       <uri><?php the_author_url()?></uri>
+                       <?php $author_url = get_the_author_meta('url'); if ( !empty($author_url) ) : ?>
+                       <uri><?php the_author_meta('url')?></uri>

                        <?php endif; ?>
                </author>
                <title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
                        <?php endif; ?>
                </author>
                <title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>


@@ -44,7 +43,7 @@ $more = 1;
                <?php the_category_rss('atom') ?>
                <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>
                <?php the_category_rss('atom') ?>
                <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>

-               <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
+               <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content_feed('atom') ?>]]></content>

 <?php endif; ?>
 <?php atom_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
 <?php endif; ?>
 <?php atom_enclosure(); ?>
 <?php do_action('atom_entry'); ?>