<!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][5813] trunk/bp-core: Move bp_screens and bp_actions onto bp_template_redirect action, which is hooked to template redirect.</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/5813">5813</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-21 00:12:13 +0000 (Tue, 21 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move bp_screens and bp_actions onto bp_template_redirect action, which is hooked to template redirect.
* Moves template redirecting where it belongs, the template_redirect action
* Leaves bp_ready hooked to 'wp' for now, pending testing
* Anything hooked to bp_ready works the way it always did
* Anything properly hooked to bp_actions and bp_screens works normally
* Fully backwards compatible
* Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4029">#4029</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorebpcorehooksphp">trunk/bp-core/bp-core-hooks.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 (5812 => 5813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2012-02-20 18:36:12 UTC (rev 5812)
+++ trunk/bp-core/bp-core-catchuri.php 2012-02-21 00:12:13 UTC (rev 5813)
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> bp_do_404();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'wp', 'bp_core_catch_no_access' );
</del><ins>+add_action( 'bp_template_redirect', 'bp_core_catch_no_access', 1 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Redirects a user to login for BP pages that require access control and adds an error message (if
</span></span></pre></div>
<a id="trunkbpcorebpcorehooksphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-hooks.php (5812 => 5813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-hooks.php 2012-02-20 18:36:12 UTC (rev 5812)
+++ trunk/bp-core/bp-core-hooks.php 2012-02-21 00:12:13 UTC (rev 5813)
</span><span class="lines">@@ -24,12 +24,22 @@
</span><span class="cx"> * development, and to limit the amount of potential future code changes when
</span><span class="cx"> * updates to WordPress occur.
</span><span class="cx"> */
</span><del>-add_action( 'plugins_loaded', 'bp_loaded', 10 );
-add_action( 'init', 'bp_init', 10 );
-add_action( 'wp', 'bp_ready', 10 );
</del><ins>+add_action( 'plugins_loaded', 'bp_loaded', 10 );
+add_action( 'init', 'bp_init', 10 );
+add_action( 'wp', 'bp_ready', 10 );
+add_action( 'template_redirect', 'bp_template_redirect', 10 );
+add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts', 10 );
+add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 10 );
+add_action( 'template_redirect', 'bp_template_redirect', 10 );
+add_filter( 'template_include', 'bp_template_include', 10 );
+add_filter( 'after_theme_setup', 'bp_after_theme_setup', 10 );
+add_filter( 'map_meta_cap', 'bp_map_meta_caps', 10, 4 );
+
+// Piggy back WordPress theme actions
+add_action( 'wp_head', 'bp_head', 10 );
+add_action( 'wp_footer', 'bp_footer', 10 );
+
</ins><span class="cx"> //add_action( 'generate_rewrite_rules', 'bp_generate_rewrite_rules', 10 );
</span><del>-//add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts', 10 );
-//add_filter( 'template_include', 'bp_template_include', 10 );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_loaded - Attached to 'plugins_loaded' above
</span><span class="lines">@@ -56,31 +66,19 @@
</span><span class="cx"> add_action( 'bp_init', 'bp_setup_title', 8 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * bp_ready - Attached to 'wp' above
</del><ins>+ * bp_template_redirect - Attached to 'template_redirect' above
</ins><span class="cx"> *
</span><del>- * Attach various initialization actions to the bp_init action.
</del><ins>+ * Attach various template actions to the bp_template_redirect action.
</ins><span class="cx"> * The load order helps to execute code at the correct time.
</span><del>- * v---Load order
</del><ins>+ *
+ * Note that we currently use template_redirect versus template include because
+ * BuddyPress is a bully and overrides the existing themes output in many
+ * places. This won't always be this way, we promise.
+ * v---Load order
</ins><span class="cx"> */
</span><del>-add_action( 'bp_ready', 'bp_actions', 2 );
-add_action( 'bp_ready', 'bp_screens', 4 );
</del><ins>+add_action( 'bp_template_redirect', 'bp_actions', 2 );
+add_action( 'bp_template_redirect', 'bp_screens', 4 );
</ins><span class="cx">
</span><del>-/** Theme *********************************************************************/
-
-// Piggy back WordPress theme actions
-add_action( 'wp_head', 'bp_head' );
-add_action( 'wp_footer', 'bp_footer' );
-
-/** Admin Bar *****************************************************************/
-
-// Setup the navigation menu
-add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 11 );
-
-/** Roles and Capabilities ****************************************************/
-
-// Map our custom capabilities onto WP's
-add_filter( 'map_meta_cap', 'bp_map_meta_caps', 10, 4 );
-
</del><span class="cx"> /** The hooks *****************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -214,4 +212,58 @@
</span><span class="cx"> do_action( 'bp_footer' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Enqueue BuddyPress specific CSS and JS
+ *
+ * @since bbPress (r5812)
+ *
+ * @uses do_action() Calls 'bp_enqueue_scripts'
+ */
+function bp_enqueue_scripts() {
+ do_action ( 'bp_enqueue_scripts' );
+}
+
+/**
+ * Piggy back action for BuddyPress sepecific theme actions once the theme has
+ * been setup and the theme's functions.php has loaded.
+ *
+ * @since bbPress (r5812)
+ *
+ * @uses do_action() Calls 'bp_after_theme_setup'
+ */
+function bp_after_theme_setup() {
+ do_action ( 'bp_after_theme_setup' );
+}
+
+/** Theme Compatibility Filter ************************************************/
+
+/**
+ * The main filter used for theme compatibility and displaying custom BuddyPress
+ * theme files.
+ *
+ * @since BuddyPress (r5812)
+ *
+ * @uses apply_filters()
+ *
+ * @param string $template
+ * @return string Template file to use
+ */
+function bp_template_include( $template = '' ) {
+ return apply_filters( 'bp_template_include', $template );
+}
+
+/** Theme Permissions *********************************************************/
+
+/**
+ * The main action used for redirecting BuddyPress theme actions that are not
+ * permitted by the current_user
+ *
+ * @since BuddyPress (r5812)
+ *
+ * @uses do_action()
+ */
+function bp_template_redirect() {
+ do_action( 'bp_template_redirect' );
+}
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>