<!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" />
<title>[22431] trunk/wp-includes: Don't return encoded ampersands from get_post_comments_feed_link() to avoid canonical redirect issues.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22431">22431</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-07 19:56:10 +0000 (Wed, 07 Nov 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't return encoded ampersands from get_post_comments_feed_link() to avoid canonical redirect issues. Apply esc_url() when appropriate.

props markjaquith, SergeyBiryukov. fixes <a href="http://core.trac.wordpress.org/ticket/21841">#21841</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesfeedatomcommentsphp">trunk/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunkwpincludesfeedatomphp">trunk/wp-includes/feed-atom.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentspopupphp">trunk/wp-includes/theme-compat/comments-popup.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (22430 => 22431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php        2012-11-07 19:37:54 UTC (rev 22430)
+++ trunk/wp-includes/deprecated.php        2012-11-07 19:56:10 UTC (rev 22431)
</span><span class="lines">@@ -1215,7 +1215,7 @@
</span><span class="cx">  */
</span><span class="cx"> function comments_rss() {
</span><span class="cx">         _deprecated_function( __FUNCTION__, '2.2', 'get_post_comments_feed_link()' );
</span><del>-        return get_post_comments_feed_link();
</del><ins>+        return esc_url( get_post_comments_feed_link() );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesfeedatomcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-atom-comments.php (22430 => 22431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-atom-comments.php        2012-11-07 19:37:54 UTC (rev 22430)
+++ trunk/wp-includes/feed-atom-comments.php        2012-11-07 19:56:10 UTC (rev 22431)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php if ( is_singular() ) { ?&gt;
</span><span class="cx">         &lt;link rel=&quot;alternate&quot; type=&quot;&lt;?php bloginfo_rss('html_type'); ?&gt;&quot; href=&quot;&lt;?php comments_link_feed(); ?&gt;&quot; /&gt;
</span><del>-        &lt;link rel=&quot;self&quot; type=&quot;application/atom+xml&quot; href=&quot;&lt;?php echo get_post_comments_feed_link('', 'atom'); ?&gt;&quot; /&gt;
-        &lt;id&gt;&lt;?php echo get_post_comments_feed_link('', 'atom'); ?&gt;&lt;/id&gt;
</del><ins>+        &lt;link rel=&quot;self&quot; type=&quot;application/atom+xml&quot; href=&quot;&lt;?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?&gt;&quot; /&gt;
+        &lt;id&gt;&lt;?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?&gt;&lt;/id&gt;
</ins><span class="cx"> &lt;?php } elseif(is_search()) { ?&gt;
</span><span class="cx">         &lt;link rel=&quot;alternate&quot; type=&quot;&lt;?php bloginfo_rss('html_type'); ?&gt;&quot; href=&quot;&lt;?php echo home_url() . '?s=' . get_search_query(); ?&gt;&quot; /&gt;
</span><span class="cx">         &lt;link rel=&quot;self&quot; type=&quot;application/atom+xml&quot; href=&quot;&lt;?php echo get_search_comments_feed_link('', 'atom'); ?&gt;&quot; /&gt;
</span></span></pre></div>
<a id="trunkwpincludesfeedatomphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-atom.php (22430 => 22431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-atom.php        2012-11-07 19:37:54 UTC (rev 22430)
+++ trunk/wp-includes/feed-atom.php        2012-11-07 19:56:10 UTC (rev 22431)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> &lt;?php atom_enclosure(); ?&gt;
</span><span class="cx"> &lt;?php do_action('atom_entry'); ?&gt;
</span><span class="cx">                 &lt;link rel=&quot;replies&quot; type=&quot;&lt;?php bloginfo_rss('html_type'); ?&gt;&quot; href=&quot;&lt;?php the_permalink_rss() ?&gt;#comments&quot; thr:count=&quot;&lt;?php echo get_comments_number()?&gt;&quot;/&gt;
</span><del>-                &lt;link rel=&quot;replies&quot; type=&quot;application/atom+xml&quot; href=&quot;&lt;?php echo get_post_comments_feed_link(0,'atom') ?&gt;&quot; thr:count=&quot;&lt;?php echo get_comments_number()?&gt;&quot;/&gt;
</del><ins>+                &lt;link rel=&quot;replies&quot; type=&quot;application/atom+xml&quot; href=&quot;&lt;?php echo esc_url( get_post_comments_feed_link(0, 'atom') ); ?&gt;&quot; thr:count=&quot;&lt;?php echo get_comments_number()?&gt;&quot;/&gt;
</ins><span class="cx">                 &lt;thr:total&gt;&lt;?php echo get_comments_number()?&gt;&lt;/thr:total&gt;
</span><span class="cx">         &lt;/entry&gt;
</span><span class="cx">         &lt;?php endwhile ; ?&gt;
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (22430 => 22431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php        2012-11-07 19:37:54 UTC (rev 22430)
+++ trunk/wp-includes/link-template.php        2012-11-07 19:56:10 UTC (rev 22431)
</span><span class="lines">@@ -484,9 +484,9 @@
</span><span class="cx">         } else {
</span><span class="cx">                 $type = get_post_field('post_type', $post_id);
</span><span class="cx">                 if ( 'page' == $type )
</span><del>-                        $url = home_url(&quot;?feed=$feed&amp;amp;page_id=$post_id&quot;);
</del><ins>+                        $url = add_query_arg( array( 'feed' =&gt; $feed, 'page_id' =&gt; $post_id ), home_url( '/' ) );
</ins><span class="cx">                 else
</span><del>-                        $url = home_url(&quot;?feed=$feed&amp;amp;p=$post_id&quot;);
</del><ins>+                        $url = add_query_arg( array( 'feed' =&gt; $feed, 'p' =&gt; $post_id ), home_url( '/' ) );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         return apply_filters('post_comments_feed_link', $url);
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx">  * @return string Link to the comment feed for the current post.
</span><span class="cx"> */
</span><span class="cx"> function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
</span><del>-        $url = get_post_comments_feed_link($post_id, $feed);
</del><ins>+        $url = esc_url( get_post_comments_feed_link( $post_id, $feed ) );
</ins><span class="cx">         if ( empty($link_text) )
</span><span class="cx">                 $link_text = __('Comments Feed');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentspopupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments-popup.php (22430 => 22431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments-popup.php        2012-11-07 19:37:54 UTC (rev 22430)
+++ trunk/wp-includes/theme-compat/comments-popup.php        2012-11-07 19:56:10 UTC (rev 22431)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;h2 id=&quot;comments&quot;&gt;&lt;?php _e('Comments'); ?&gt;&lt;/h2&gt;
</span><span class="cx"> 
</span><del>-&lt;p&gt;&lt;a href=&quot;&lt;?php echo get_post_comments_feed_link($post-&gt;ID); ?&gt;&quot;&gt;&lt;?php _e('&lt;abbr title=&quot;Really Simple Syndication&quot;&gt;RSS&lt;/abbr&gt; feed for comments on this post.'); ?&gt;&lt;/a&gt;&lt;/p&gt;
</del><ins>+&lt;p&gt;&lt;a href=&quot;&lt;?php echo esc_url( get_post_comments_feed_link($post-&gt;ID) ); ?&gt;&quot;&gt;&lt;?php _e('&lt;abbr title=&quot;Really Simple Syndication&quot;&gt;RSS&lt;/abbr&gt; feed for comments on this post.'); ?&gt;&lt;/a&gt;&lt;/p&gt;
</ins><span class="cx"> 
</span><span class="cx"> &lt;?php if ( pings_open() ) { ?&gt;
</span><span class="cx"> &lt;p&gt;&lt;?php printf(__('The &lt;abbr title=&quot;Universal Resource Locator&quot;&gt;URL&lt;/abbr&gt; to TrackBack this entry is: &lt;em&gt;%s&lt;/em&gt;'), get_trackback_url()); ?&gt;&lt;/p&gt;
</span></span></pre>
</div>
</div>

</body>
</html>