Changeset 14950

Timestamp:

05/26/2010 05:47:29 PM (16 years ago)

Author:

westi

Message:

Some more url escaping in feeds. See #13555.

Location:

trunk/wp-includes

Files:

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

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

@@ -28 +28 @@
 
 <?php if ( is_singular() ) { ?>
-        <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo get_comments_link(); ?>" />
+        <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php comments_link_feed(); ?>" />
         <link rel="self" type="application/atom+xml" href="<?php echo get_post_comments_feed_link('', 'atom'); ?>" />
         <id><?php echo get_post_comments_feed_link('', 'atom'); ?></id>

trunk/wp-includes/feed-rss2.php

@@ -35 +35 @@
                 <title><?php the_title_rss() ?></title>
                 <link><?php the_permalink_rss() ?></link>
-                <comments><?php comments_link(); ?></comments>
+                <comments><?php comments_link_feed(); ?></comments>
                 <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
                 <dc:creator><?php the_author() ?></dc:creator>
@@ -51 +51 @@
         <?php endif; ?>
 <?php endif; ?>
-                <wfw:commentRss><?php echo get_post_comments_feed_link(null, 'rss2'); ?></wfw:commentRss>
+                <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
                 <slash:comments><?php echo get_comments_number(); ?></slash:comments>
 <?php rss_enclosure(); ?>

trunk/wp-includes/feed.php

@@ -187 +187 @@
  */
 function the_permalink_rss() {
-        echo apply_filters('the_permalink_rss', get_permalink());
+        echo esc_url( apply_filters('the_permalink_rss', get_permalink() ));
+}
+
+/**
+ * Outputs the link to the comments for the current post in an xml safe way
+ * 
+ * @since 3.0.0
+ * @return none
+ */
+function comments_link_feed() {
+        echo esc_url( get_comments_link() );
 }