WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No named entities in comment feeds. Props nbachiyski. fixes #8464 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-12-04 17:47:50 +00:00
parent 0284ef6ae0
commit fe44ea7c48
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/feed-atom-comments.php
View File

@ -15,11 +15,11 @@ echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>'
> >
<title type="text"><?php <title type="text"><?php
if ( is_singular() ) if ( is_singular() )
printf(__('Comments on: %s'), get_the_title_rss()); printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
elseif ( is_search() ) elseif ( is_search() )
printf(__('Comments for %1$s searching on %2$s'), get_bloginfo_rss( 'name' ), attribute_escape(get_search_query())); printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), attribute_escape(get_search_query()));
else else
printf(__('Comments for %s'), get_bloginfo_rss( 'name' ) . get_wp_title_rss()); printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
?></title> ?></title>
<subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle> <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
@ -50,9 +50,9 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment();
if ( !is_singular() ) { if ( !is_singular() ) {
$title = get_the_title($comment_post->ID); $title = get_the_title($comment_post->ID);
$title = apply_filters('the_title_rss', $title); $title = apply_filters('the_title_rss', $title);
printf(__('Comment on %1$s by %2$s'), $title, get_comment_author_rss()); printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
} else { } else {
printf(__('By: %s'), get_comment_author_rss()); printf(ent2ncr(__('By: %s')), get_comment_author_rss());
} }
?></title> ?></title>
<link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss('html_type'); ?>" /> <link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss('html_type'); ?>" />

12
wp-includes/feed-rss2-comments.php
View File

@ -18,11 +18,11 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
<channel> <channel>
<title><?php <title><?php
if ( is_singular() ) if ( is_singular() )
printf(__('Comments on: %s'), get_the_title_rss()); printf(ent2ncr(__('Comment&uuml;s on: %s')), get_the_title_rss());
elseif ( is_search() ) elseif ( is_search() )
printf(__('Comments for %s searching on %s'), get_bloginfo_rss( 'name' ), attribute_escape($wp_query->query_vars['s'])); printf(ent2ncr(__('Comments for %s searching on %s')), get_bloginfo_rss( 'name' ), attribute_escape($wp_query->query_vars['s']));
else else
printf(__('Comments for %s'), get_bloginfo_rss( 'name' ) . get_wp_title_rss()); printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
?></title> ?></title>
<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" /> <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
<link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link> <link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
@ -42,9 +42,9 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment();
if ( !is_singular() ) { if ( !is_singular() ) {
$title = get_the_title($comment_post->ID); $title = get_the_title($comment_post->ID);
$title = apply_filters('the_title_rss', $title); $title = apply_filters('the_title_rss', $title);
printf(__('Comment on %1$s by %2$s'), $title, get_comment_author_rss()); printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
} else { } else {
printf(__('By: %s'), get_comment_author_rss()); printf(ent2ncr(__('By: %s')), get_comment_author_rss());
} }
?></title> ?></title>
<link><?php comment_link() ?></link> <link><?php comment_link() ?></link>
@ -52,7 +52,7 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment();
<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></pubDate> <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></pubDate>
<guid isPermaLink="false"><?php comment_guid() ?></guid> <guid isPermaLink="false"><?php comment_guid() ?></guid>
<?php if ( post_password_required($comment_post) ) : ?> <?php if ( post_password_required($comment_post) ) : ?>
<description><?php _e('Protected Comments: Please enter your password to view comments.'); ?></description> <description><?php echo ent2ncr(__('Protected Comments: Please enter your password to view comments.')); ?></description>
<content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded> <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
<?php else : // post pass ?> <?php else : // post pass ?>
<description><?php comment_text_rss() ?></description> <description><?php comment_text_rss() ?></description>