<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14950] trunk/wp-includes: Some more url escaping in feeds.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14950">14950</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-05-26 17:47:29 +0000 (Wed, 26 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some more url escaping in feeds. See <a href="http://trac.wordpress.org/ticket/13555">#13555</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfeedatomcommentsphp">trunk/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunkwpincludesfeedrss2php">trunk/wp-includes/feed-rss2.php</a></li>
<li><a href="#trunkwpincludesfeedphp">trunk/wp-includes/feed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfeedatomcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-atom-comments.php (14949 => 14950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-atom-comments.php 2010-05-26 17:27:18 UTC (rev 14949)
+++ trunk/wp-includes/feed-atom-comments.php 2010-05-26 17:47:29 UTC (rev 14950)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastcommentmodified('GMT'), false); ?></updated>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_singular() ) { ?>
</span><del>- <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo get_comments_link(); ?>" />
</del><ins>+ <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php comments_link_feed(); ?>" />
</ins><span class="cx"> <link rel="self" type="application/atom+xml" href="<?php echo get_post_comments_feed_link('', 'atom'); ?>" />
</span><span class="cx"> <id><?php echo get_post_comments_feed_link('', 'atom'); ?></id>
</span><span class="cx"> <?php } elseif(is_search()) { ?>
</span></span></pre></div>
<a id="trunkwpincludesfeedrss2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-rss2.php (14949 => 14950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-rss2.php 2010-05-26 17:27:18 UTC (rev 14949)
+++ trunk/wp-includes/feed-rss2.php 2010-05-26 17:47:29 UTC (rev 14950)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> <item>
</span><span class="cx"> <title><?php the_title_rss() ?></title>
</span><span class="cx"> <link><?php the_permalink_rss() ?></link>
</span><del>- <comments><?php comments_link(); ?></comments>
</del><ins>+ <comments><?php comments_link_feed(); ?></comments>
</ins><span class="cx"> <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
</span><span class="cx"> <dc:creator><?php the_author() ?></dc:creator>
</span><span class="cx"> <?php the_category_rss() ?>
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> <content:encoded><![CDATA[<?php the_excerpt_rss() ?>]]></content:encoded>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><del>- <wfw:commentRss><?php echo get_post_comments_feed_link(null, 'rss2'); ?></wfw:commentRss>
</del><ins>+ <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
</ins><span class="cx"> <slash:comments><?php echo get_comments_number(); ?></slash:comments>
</span><span class="cx"> <?php rss_enclosure(); ?>
</span><span class="cx"> <?php do_action('rss2_item'); ?>
</span></span></pre></div>
<a id="trunkwpincludesfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed.php (14949 => 14950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed.php 2010-05-26 17:27:18 UTC (rev 14949)
+++ trunk/wp-includes/feed.php 2010-05-26 17:47:29 UTC (rev 14950)
</span><span class="lines">@@ -186,10 +186,20 @@
</span><span class="cx"> * @uses apply_filters() Call 'the_permalink_rss' on the post permalink
</span><span class="cx"> */
</span><span class="cx"> function the_permalink_rss() {
</span><del>- echo apply_filters('the_permalink_rss', get_permalink());
</del><ins>+ echo esc_url( apply_filters('the_permalink_rss', get_permalink() ));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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() );
+}
+
+/**
</ins><span class="cx"> * Display the feed GUID for the current comment.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span></span></pre>
</div>
</div>
</body>
</html>