<!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>[BuddyPress][5954] trunk/bp-core/bp-core-catchuri.php: Correct rel=canonical tags for BuddyPress content.</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://buddypress.trac.wordpress.org/changeset/5954">5954</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-03-31 14:40:55 +0000 (Sat, 31 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct rel=canonical tags for BuddyPress content. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4087">#4087</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (5953 => 5954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2012-03-29 23:46:45 UTC (rev 5953)
+++ trunk/bp-core/bp-core-catchuri.php 2012-03-31 14:40:55 UTC (rev 5954)
</span><span class="lines">@@ -590,6 +590,42 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Output rel=canonical header tag for BuddyPress content
+ *
+ * @since 1.6
+ */
+function bp_rel_canonical() {
+ // Build the URL in the address bar
+ $requested_url = is_ssl() ? 'https://' : 'http://';
+ $requested_url .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+
+ // Stash query args
+ $url_stack = explode( '?', $requested_url );
+
+ // Build the canonical URL out of the redirect stack
+ if ( isset( $bp->canonical_stack['base_url'] ) )
+ $url_stack[0] = $bp->canonical_stack['base_url'];
+
+ if ( isset( $bp->canonical_stack['component'] ) )
+ $url_stack[0] = trailingslashit( $url_stack[0] . $bp->canonical_stack['component'] );
+
+ if ( isset( $bp->canonical_stack['action'] ) )
+ $url_stack[0] = trailingslashit( $url_stack[0] . $bp->canonical_stack['action'] );
+
+ if ( !empty( $bp->canonical_stack['action_variables'] ) ) {
+ foreach( (array) $bp->canonical_stack['action_variables'] as $av ) {
+ $url_stack[0] = trailingslashit( $url_stack[0] . $av );
+ }
+ }
+
+ // Add trailing slash
+ $url_stack[0] = trailingslashit( $url_stack[0] );
+
+ // Output rel=canonical tag
+ echo "<link rel='canonical' href='" . esc_attr( $url_stack[0] ) . "' />\n";
+}
+
+/**
</ins><span class="cx"> * Remove WordPress's really awesome canonical redirect if we are trying to load
</span><span class="cx"> * BuddyPress specific content. Avoids issues with WordPress thinking that a
</span><span class="cx"> * BuddyPress URL might actually be a blog post or page.
</span><span class="lines">@@ -606,4 +642,20 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', '_bp_maybe_remove_redirect_canonical' );
</span><span class="cx">
</span><del>-?>
</del><ins>+/**
+ * Remove WordPress's rel=canonical HTML tag if we are trying to load BuddyPress
+ * specific content.
+ *
+ * This function should be considered temporary, and may be removed without
+ * notice in future versions of BuddyPress.
+ *
+ * @since 1.6
+ */
+function _bp_maybe_remove_rel_canonical() {
+ if ( ! bp_is_blog_page() && ! is_404() ) {
+ remove_action( 'wp_head', 'rel_canonical' );
+ add_action( 'bp_head', 'bp_rel_canonical' );
+ }
+}
+add_action( 'wp_head', '_bp_maybe_remove_rel_canonical', 8 );
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>