diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
commit | 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch) | |
tree | 2a06e5261263c68d8afd95a6328879dc289cb909 /wp-includes/feed-rss2-comments.php | |
parent | b83c34a7010faee0223f6037025c350da12e05e6 (diff) | |
download | wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip |
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/feed-rss2-comments.php')
-rw-r--r-- | wp-includes/feed-rss2-comments.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php index adb2930..7bd5ae2 100644 --- a/wp-includes/feed-rss2-comments.php +++ b/wp-includes/feed-rss2-comments.php @@ -1,10 +1,10 @@ <?php -header('Content-type: text/xml;charset=' . get_option('blog_charset'), true); +header('Content-Type: text/xml;charset=' . get_option('blog_charset'), true); -echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; +echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?> <!-- generator="wordpress/<?php echo $wp_version ?>" --> -<rss version="2.0" +<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" > @@ -17,12 +17,12 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; else printf(__('Comments for %s'), get_bloginfo_rss( 'name' ) . get_wp_title_rss()); ?></title> - <link><?php (is_single()) ? permalink_single_rss() : bloginfo_rss("url") ?></link> + <link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link> <description><?php bloginfo_rss("description") ?></description> <pubDate><?php echo gmdate('r'); ?></pubDate> <generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator> - -<?php + <?php do_action('commentsrss2_head'); ?> +<?php if ( have_comments() ) : while ( have_comments() ) : the_comment(); $comment_post = get_post($comment->comment_post_ID); get_post_custom($comment_post->ID); @@ -31,7 +31,6 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment(); <title><?php if ( !is_singular() ) { $title = get_the_title($comment_post->ID); - $title = apply_filters('the_title', $title); $title = apply_filters('the_title_rss', $title); printf(__('Comment on %1$s by %2$s'), $title, get_comment_author_rss()); } else { |