<!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][6177] trunk: Reverts piggybacking of bp_head and bp_footer actions from r5736.</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/6177">6177</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-07-13 13:20:13 +0000 (Fri, 13 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reverts piggybacking of bp_head and bp_footer actions from r5736.
Moving the bp_head and bp_footer actions outside of the template, and
piggybacking them on WP core actions, causes problems for backward
compatibility with themes that have mimicked BP's previous behavior of
hardcoding the actions.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4339">#4339</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreactionsphp">trunk/bp-core/bp-core-actions.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfooterphp">trunk/bp-themes/bp-default/footer.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="trunkbpcorebpcoreactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-actions.php (6176 => 6177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-actions.php 2012-07-11 21:36:51 UTC (rev 6176)
+++ trunk/bp-core/bp-core-actions.php 2012-07-13 13:20:13 UTC (rev 6177)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> add_action( 'plugins_loaded', 'bp_loaded', 10 );
</span><span class="cx"> add_action( 'init', 'bp_init', 10 );
</span><span class="cx"> add_action( 'wp', 'bp_ready', 10 );
</span><del>-add_action( 'wp_head', 'bp_head', 10 );
-add_action( 'wp_footer', 'bp_footer', 10 );
</del><span class="cx"> add_action( 'setup_theme', 'bp_setup_theme', 10 );
</span><span class="cx"> add_action( 'after_theme_setup', 'bp_after_theme_setup', 10 );
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts', 10 );
</span><span class="lines">@@ -201,28 +199,6 @@
</span><span class="cx"> /** Theme *********************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Piggy-back action for BuddyPress specific <head> actions in a theme
- *
- * @since BuddyPress (1.6)
- *
- * @uses do_action() Calls 'bp_head' hook
- */
-function bp_head() {
- do_action( 'bp_head' );
-}
-
-/**
- * Piggy-back action for BuddyPress specific footer actions in a theme
- *
- * @since BuddyPress (1.6)
- *
- * @uses do_action() Calls 'bp_footer' hook
- */
-function bp_footer() {
- do_action( 'bp_footer' );
-}
-
-/**
</del><span class="cx"> * Enqueue BuddyPress specific CSS and JS
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/footer.php (6176 => 6177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/footer.php 2012-07-11 21:36:51 UTC (rev 6176)
+++ trunk/bp-themes/bp-default/footer.php 2012-07-13 13:20:13 UTC (rev 6177)
</span><span class="lines">@@ -15,13 +15,13 @@
</span><span class="cx"> <p><?php printf( __( 'Proudly powered by <a href="%1$s">WordPress</a> and <a href="%2$s">BuddyPress</a>.', 'buddypress' ), 'http://wordpress.org', 'http://buddypress.org' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_in_footer' ); ?>
</del><ins>+ <?php do_action( 'bp_footer' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #footer -->
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_footer' ); ?>
</span><span class="cx">
</span><del>- <?php wp_footer(); // @see bp_footer(); ?>
</del><ins>+ <?php wp_footer(); ?>
</ins><span class="cx">
</span><span class="cx"> </body>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (6176 => 6177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2012-07-11 21:36:51 UTC (rev 6176)
+++ trunk/bp-themes/bp-default/header.php 2012-07-13 13:20:13 UTC (rev 6177)
</span><span class="lines">@@ -7,7 +7,8 @@
</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 wp_head(); // @see bp_head(); ?>
</del><ins>+ <?php do_action( 'bp_head' ); ?>
+ <?php wp_head(); ?>
</ins><span class="cx">
</span><span class="cx"> </head>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>