<!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][5736] trunk: Move bp_head() and bp_footer() actions into bp-core-hooks.php, and piggy back them onto wp_head() and wp_footer().</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/5736">5736</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-12 19:58:09 +0000 (Sun, 12 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move bp_head() and bp_footer() actions into bp-core-hooks.php, and piggy back them onto wp_head() and wp_footer(). Also add some missing semi-colons in header.php and footer.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorehooksphp">trunk/bp-core/bp-core-hooks.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfooterphp">trunk/bp-themes/bp-default/footer.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/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="trunkbpcorebpcorehooksphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-hooks.php (5735 => 5736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-hooks.php 2012-02-12 19:39:48 UTC (rev 5735)
+++ trunk/bp-core/bp-core-hooks.php 2012-02-12 19:58:09 UTC (rev 5736)
</span><span class="lines">@@ -67,10 +67,16 @@
</span><span class="cx"> add_action( 'bp_ready', 'bp_actions', 2 );
</span><span class="cx"> add_action( 'bp_ready', 'bp_screens', 4 );
</span><span class="cx">
</span><ins>+/** Theme *********************************************************************/
+
+// Piggy back WordPress theme actions
+add_action( 'wp_head', 'bp_head' );
+add_action( 'wp_footer', 'bp_footer' );
+
</ins><span class="cx"> /** Admin Bar *****************************************************************/
</span><span class="cx">
</span><span class="cx"> // Setup the navigation menu
</span><del>-add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 11 );
</del><ins>+add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 11 );
</ins><span class="cx">
</span><span class="cx"> /** The hooks *****************************************************************/
</span><span class="cx">
</span><span class="lines">@@ -216,4 +222,28 @@
</span><span class="cx"> /** Filters ***************************************************************/
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+/** Theme *********************************************************************/
+
+/**
+ * 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' );
+}
+
+?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/footer.php (5735 => 5736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/footer.php 2012-02-12 19:39:48 UTC (rev 5735)
+++ trunk/bp-themes/bp-default/footer.php 2012-02-12 19:58:09 UTC (rev 5736)
</span><span class="lines">@@ -1,26 +1,27 @@
</span><span class="cx"> </div> <!-- #container -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_container' ) ?>
- <?php do_action( 'bp_before_footer' ) ?>
</del><ins>+ <?php do_action( 'bp_after_container' ); ?>
+ <?php do_action( 'bp_before_footer' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="footer">
</span><span class="cx"> <?php if ( is_active_sidebar( 'first-footer-widget-area' ) || is_active_sidebar( 'second-footer-widget-area' ) || is_active_sidebar( 'third-footer-widget-area' ) || is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?>
</span><span class="cx"> <div id="footer-widgets">
</span><del>- <?php get_sidebar( 'footer' ) ?>
</del><ins>+ <?php get_sidebar( 'footer' ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <div id="site-generator" role="contentinfo">
</span><del>- <?php do_action( 'bp_dtheme_credits' ) ?>
- <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>
</del><ins>+ <?php do_action( 'bp_dtheme_credits' ); ?>
+ <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>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_footer' ) ?>
</del><ins>+ <?php do_action( 'bp_in_footer' ); ?>
+
</ins><span class="cx"> </div><!-- #footer -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_footer' ) ?>
</del><ins>+ <?php do_action( 'bp_after_footer' ); ?>
</ins><span class="cx">
</span><del>- <?php wp_footer(); ?>
</del><ins>+ <?php wp_footer(); // @see bp_footer(); ?>
</ins><span class="cx">
</span><span class="cx"> </body>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (5735 => 5736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2012-02-12 19:39:48 UTC (rev 5735)
+++ trunk/bp-themes/bp-default/functions.php 2012-02-12 19:58:09 UTC (rev 5736)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_enqueue_scripts() {
</span><ins>+
</ins><span class="cx"> // Bump this when changes are made to bust cache
</span><span class="cx"> $version = '20111023';
</span><span class="cx">
</span><span class="lines">@@ -157,8 +158,11 @@
</span><span class="cx"> 'mark_as_fav' => __( 'Favorite', 'buddypress' ),
</span><span class="cx"> 'remove_fav' => __( 'Remove Favorite', 'buddypress' )
</span><span class="cx"> );
</span><ins>+ wp_localize_script( 'dtheme-ajax-js', 'BP_DTheme', $params );
</ins><span class="cx">
</span><del>- wp_localize_script( 'dtheme-ajax-js', 'BP_DTheme', $params );
</del><ins>+ // Maybe enqueue comment reply JS
+ if ( is_singular() && bp_is_blog_page() && get_option( 'thread_comments' ) )
+ wp_enqueue_script( 'comment-reply' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'bp_dtheme_enqueue_scripts' );
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (5735 => 5736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2012-02-12 19:39:48 UTC (rev 5735)
+++ trunk/bp-themes/bp-default/header.php 2012-02-12 19:58:09 UTC (rev 5736)
</span><span class="lines">@@ -2,20 +2,13 @@
</span><span class="cx">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head profile="http://gmpg.org/xfn/11">
</span><del>- <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ) ?>; charset=<?php bloginfo( 'charset' ) ?>" />
</del><ins>+ <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php bloginfo( 'charset' ); ?>" />
</ins><span class="cx"> <?php if ( current_theme_supports( 'bp-default-responsive' ) ) : ?><meta name="viewport" content="width=device-width, initial-scale=1.0"><?php endif; ?>
</span><span class="cx"> <title><?php wp_title( '|', true, 'right' ); bloginfo( 'name' ); ?></title>
</span><ins>+ <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_head' ) ?>
</del><ins>+ <?php wp_head(); // @see bp_head(); ?>
</ins><span class="cx">
</span><del>- <link rel="pingback" href="<?php bloginfo( 'pingback_url' ) ?>" />
-
- <?php
- if ( is_singular() && bp_is_blog_page() && get_option( 'thread_comments' ) )
- wp_enqueue_script( 'comment-reply' );
-
- wp_head();
- ?>
</del><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body <?php body_class() ?> id="bp-default">
</span><span class="lines">@@ -27,19 +20,19 @@
</span><span class="cx"> <div class="padder">
</span><span class="cx"> <h1 id="logo" role="banner"><a href="<?php echo home_url(); ?>" title="<?php _ex( 'Home', 'Home page banner link title', 'buddypress' ); ?>"><?php bp_site_name(); ?></a></h1>
</span><span class="cx">
</span><del>- <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
</del><ins>+ <form action="<?php echo bp_search_form_action(); ?>" method="post" id="search-form">
</ins><span class="cx"> <label for="search-terms" class="accessibly-hidden"><?php _e( 'Search for:', 'buddypress' ); ?></label>
</span><span class="cx"> <input type="text" id="search-terms" name="search-terms" value="<?php echo isset( $_REQUEST['s'] ) ? esc_attr( $_REQUEST['s'] ) : ''; ?>" />
</span><span class="cx">
</span><del>- <?php echo bp_search_form_type_select() ?>
</del><ins>+ <?php echo bp_search_form_type_select(); ?>
</ins><span class="cx">
</span><del>- <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</del><ins>+ <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ); ?>" />
</ins><span class="cx">
</span><del>- <?php wp_nonce_field( 'bp_search_form' ) ?>
</del><ins>+ <?php wp_nonce_field( 'bp_search_form' ); ?>
</ins><span class="cx">
</span><span class="cx"> </form><!-- #search-form -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_search_login_bar' ) ?>
</del><ins>+ <?php do_action( 'bp_search_login_bar' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #search-bar -->
</span><span class="lines">@@ -48,11 +41,11 @@
</span><span class="cx"> <?php wp_nav_menu( array( 'container' => false, 'menu_id' => 'nav', 'theme_location' => 'primary', 'fallback_cb' => 'bp_dtheme_main_nav' ) ); ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_header' ) ?>
</del><ins>+ <?php do_action( 'bp_header' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #header -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_header' ) ?>
- <?php do_action( 'bp_before_container' ) ?>
</del><ins>+ <?php do_action( 'bp_after_header' ); ?>
+ <?php do_action( 'bp_before_container' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="container">
</span></span></pre>
</div>
</div>
</body>
</html>