<!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][6605] trunk: When in theme-compat, make sure 'bp_head' gets added to 'wp_head' action.</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/6605">6605</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-12-10 13:39:30 +0000 (Mon, 10 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>When in theme-compat, make sure 'bp_head' gets added to 'wp_head' action. Also introduce bp_head() function, and use in bp-default header.php. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4669">#4669</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoredependencyphp">trunk/bp-core/bp-core-dependency.php</a></li>
<li><a href="#trunkbpcorebpcorethemecompatibilityphp">trunk/bp-core/bp-core-theme-compatibility.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/bp-legacy/buddypress-functions.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoredependencyphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-dependency.php (6604 => 6605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-dependency.php 2012-12-10 13:36:34 UTC (rev 6604)
+++ trunk/bp-core/bp-core-dependency.php 2012-12-10 13:39:30 UTC (rev 6605)
</span><span class="lines">@@ -109,6 +109,13 @@
</span><span class="cx"> do_action ( 'bp_widgets_init' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * BuddyPress head scripts
+ */
+function bp_head() {
+ do_action ( 'bp_head' );
+}
+
</ins><span class="cx"> /** Theme Permissions *********************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpcorebpcorethemecompatibilityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-theme-compatibility.php (6604 => 6605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-theme-compatibility.php 2012-12-10 13:36:34 UTC (rev 6604)
+++ trunk/bp-core/bp-core-theme-compatibility.php 2012-12-10 13:39:30 UTC (rev 6605)
</span><span class="lines">@@ -475,8 +475,15 @@
</span><span class="cx"> bp_remove_all_filters( 'the_content' );
</span><span class="cx">
</span><span class="cx"> // Add a filter on the_content late, which we will later remove
</span><del>- add_filter( 'the_content', 'bp_replace_the_content' );
</del><ins>+ if ( ! has_filter( 'the_content', 'bp_replace_the_content' ) ) {
+ add_filter( 'the_content', 'bp_replace_the_content' );
+ }
</ins><span class="cx">
</span><ins>+ // Add BuddyPress's head action to wp_head
+ if ( ! has_action( 'wp_head', 'bp_head' ) ) {
+ add_action( 'wp_head', 'bp_head' );
+ }
+
</ins><span class="cx"> // Find the appropriate template file
</span><span class="cx"> $template = bp_get_theme_compat_templates();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (6604 => 6605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2012-12-10 13:36:34 UTC (rev 6604)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2012-12-10 13:39:30 UTC (rev 6605)
</span><span class="lines">@@ -317,10 +317,11 @@
</span><span class="cx"> return '';
</span><span class="cx">
</span><span class="cx"> // Set up the cookies passed on this AJAX request. Store a local var to avoid conflicts
</span><del>- if ( ! empty( $_POST['cookie'] ) )
</del><ins>+ if ( ! empty( $_POST['cookie'] ) ) {
</ins><span class="cx"> $_BP_COOKIE = wp_parse_args( str_replace( '; ', '&', urldecode( $_POST['cookie'] ) ) );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $_BP_COOKIE = &$_COOKIE;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $qs = array();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (6604 => 6605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2012-12-10 13:36:34 UTC (rev 6604)
+++ trunk/bp-themes/bp-default/header.php 2012-12-10 13:39:30 UTC (rev 6605)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> <title><?php wp_title( '|', true, 'right' ); bloginfo( 'name' ); ?></title>
</span><span class="cx"> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</span><span class="cx">
</span><del>- <?php do_action( 'bp_head' ); ?>
</del><ins>+ <?php bp_head(); ?>
</ins><span class="cx"> <?php wp_head(); ?>
</span><span class="cx">
</span><span class="cx"> </head>
</span></span></pre>
</div>
</div>
</body>
</html>