Changeset 10036

Timestamp:

12/04/2008 05:47:50 PM (17 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-includes

Files:

• feed-atom-comments.php (modified) (2 diffs)
• feed-rss2-comments.php (modified) (3 diffs)

trunk/wp-includes/feed-atom-comments.php

@@ -16 +16 @@
     <title type="text"><?php
         if ( is_singular() )
-            printf(__('Comments on: %s'), get_the_title_rss());
+            printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
         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
-            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>
     <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
@@ -51 +51 @@
                 $title = get_the_title($comment_post->ID);
                 $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 {
-                printf(__('By: %s'), get_comment_author_rss());
+                printf(ent2ncr(__('By: %s')), get_comment_author_rss());
             }
         ?></title>

trunk/wp-includes/feed-rss2-comments.php

@@ -19 +19 @@
     <title><?php
         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() )
-            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
-            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>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
@@ -43 +43 @@
                 $title = get_the_title($comment_post->ID);
                 $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 {
-                printf(__('By: %s'), get_comment_author_rss());
+                printf(ent2ncr(__('By: %s')), get_comment_author_rss());
             }
         ?></title>
@@ -53 +53 @@
         <guid isPermaLink="false"><?php comment_guid() ?></guid>
 <?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>
 <?php else : // post pass ?>