<!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>[14141] trunk/wp-includes:
Advertise the correct comment feed link for a Page on the Front.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14141">14141</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-18 06:51:16 +0000 (Sun, 18 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Advertise the correct comment feed link for a Page on the Front. Do not canonical redirect the front page comments feeds to home. Fixes <a href="http://trac.wordpress.org/ticket/12452">#12452</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (14140 => 14141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-04-18 06:18:00 UTC (rev 14140)
+++ trunk/wp-includes/canonical.php 2010-04-18 06:51:16 UTC (rev 14141)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
</span><span class="cx"> if ( $redirect_url = get_permalink(get_query_var('page_id')) )
</span><span class="cx"> $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
</span><del>- } elseif ( is_page() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front') && ! $redirect_url ) {
</del><ins>+ } elseif ( is_page() && !is_feed() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front') && ! $redirect_url ) {
</ins><span class="cx"> $redirect_url = home_url('/');
</span><span class="cx"> } elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts') && ! $redirect_url ) {
</span><span class="cx"> if ( $redirect_url = get_permalink(get_option('page_for_posts')) )
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14140 => 14141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-04-18 06:18:00 UTC (rev 14140)
+++ trunk/wp-includes/link-template.php 2010-04-18 06:51:16 UTC (rev 14141)
</span><span class="lines">@@ -471,7 +471,12 @@
</span><span class="cx"> $feed = get_default_feed();
</span><span class="cx">
</span><span class="cx"> if ( '' != get_option('permalink_structure') ) {
</span><del>- $url = trailingslashit( get_permalink($post_id) ) . 'feed';
</del><ins>+ if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
+ $url = _get_page_link( $post_id );
+ else
+ $url = get_permalink($post_id);
+
+ $url = trailingslashit($url) . 'feed';
</ins><span class="cx"> if ( $feed != get_default_feed() )
</span><span class="cx"> $url .= "/$feed";
</span><span class="cx"> $url = user_trailingslashit($url, 'single_feed');
</span></span></pre>
</div>
</div>
</body>
</html>