<!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][3743] trunk: Introduce bp-core-hooks to assist in understanding load order.</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>3743</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-19 08:52:40 +0000 (Wed, 19 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce bp-core-hooks to assist in understanding load order. First initial move of actions to this new file with brief descriptions. More to do here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorehooksphp">trunk/bp-core/bp-core-hooks.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3742 => 3743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2011-01-19 08:31:10 UTC (rev 3742)
+++ trunk/bp-activity.php 2011-01-19 08:52:40 UTC (rev 3743)
</span><span class="lines">@@ -1268,5 +1268,4 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_register_activity_actions', 8 );
</span><span class="cx">
</span><del>-
</del><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (3742 => 3743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2011-01-19 08:31:10 UTC (rev 3742)
+++ trunk/bp-core/bp-core-adminbar.php 2011-01-19 08:52:40 UTC (rev 3743)
</span><span class="lines">@@ -308,6 +308,5 @@
</span><span class="cx"> add_action( 'admin_footer', 'bp_core_admin_bar' );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_core_load_admin_bar' );
</del><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (3742 => 3743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2011-01-19 08:31:10 UTC (rev 3742)
+++ trunk/bp-core/bp-core-catchuri.php 2011-01-19 08:52:40 UTC (rev 3743)
</span><span class="lines">@@ -212,7 +212,6 @@
</span><span class="cx"> // Reset the keys by merging with an empty array
</span><span class="cx"> $action_variables = array_merge( array(), $action_variables );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_core_set_uri_globals', 4 );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_core_load_template()
</span></span></pre></div>
<a id="trunkbpcorebpcorehooksphp"></a>
<div class="addfile"><h4>Added: trunk/bp-core/bp-core-hooks.php (0 => 3743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-hooks.php (rev 0)
+++ trunk/bp-core/bp-core-hooks.php 2011-01-19 08:52:40 UTC (rev 3743)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<?php
+
+/** Loaded ********************************************************************/
+
+add_action( 'plugins_loaded', 'bp_loaded', 10 );
+
+add_action( 'bp_loaded', 'bp_include', 2 );
+
+
+/** Init **********************************************************************/
+
+// Attach bp_init to WordPress init
+add_action( 'init', 'bp_init' );
+
+// Parse the URI and set globals
+add_action( 'bp_init', 'bp_core_set_uri_globals', 2 );
+
+// Setup component globals
+add_action( 'bp_init', 'bp_setup_globals', 4 );
+
+// Setup root directories for components
+add_action( 'bp_init', 'bp_setup_root_components', 6 );
+
+// Setup the navigation menu
+add_action( 'bp_init', 'bp_setup_nav', 8 );
+
+// Setup widgets
+add_action( 'bp_init', 'bp_setup_widgets', 8 );
+
+// Setup admin bar
+add_action( 'bp_init', 'bp_core_load_admin_bar' );
+
+
+?>
</ins></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (3742 => 3743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2011-01-19 08:31:10 UTC (rev 3742)
+++ trunk/bp-core.php 2011-01-19 08:52:40 UTC (rev 3743)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> define( 'BP_SEARCH_SLUG', 'search' );
</span><span class="cx">
</span><span class="cx"> // Load the files containing functions that we globally will need.
</span><ins>+require ( BP_PLUGIN_DIR . '/bp-core/bp-core-hooks.php' );
</ins><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-core/bp-core-filters.php' );
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (3742 => 3743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2011-01-19 08:31:10 UTC (rev 3742)
+++ trunk/bp-loader.php 2011-01-19 08:52:40 UTC (rev 3743)
</span><span class="lines">@@ -19,15 +19,16 @@
</span><span class="cx"> // Register BuddyPress themes contained within the bp-themes folder
</span><span class="cx"> register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
</span><span class="cx">
</span><del>-// Test to see whether this is a new installation or an upgraded version of BuddyPress
-$bp_db_version = get_site_option( 'bp-db-version' );
-if ( ! $bp_db_version )
</del><ins>+// Test to see whether this is a new installation or an upgraded version of BuddyPress
+if ( !$bp_db_version = get_site_option( 'bp-db-version' ) )
</ins><span class="cx"> $bp_db_version = get_site_option( 'bp-core-db-version' ); // BP 1.2 option name
</span><span class="cx">
</span><del>-if ( ! $bp_db_version ) {
- // This is a new installation. Run the wizard before loading BP core files
</del><ins>+// This is a new installation. Run the wizard before loading BP core files
+if ( empty( $bp_db_version ) ) {
</ins><span class="cx"> define( 'BP_IS_INSTALL', true );
</span><span class="cx"> require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
</span><ins>+
+// Existing successful installation
</ins><span class="cx"> } else {
</span><span class="cx"> /***
</span><span class="cx"> * This file will load in each BuddyPress component based on which
</span><span class="lines">@@ -36,6 +37,13 @@
</span><span class="cx"> require_once( WP_PLUGIN_DIR . '/buddypress/bp-core.php' );
</span><span class="cx"> $bp_deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
</span><span class="cx">
</span><ins>+ /**
+ * At this point in the stack, BuddyPress core has been loaded but
+ * individual components (friends/activity/groups/etc...) have not.
+ *
+ * The 'bp_core_loaded' action lets you execute code ahead of the
+ * other components.
+ */
</ins><span class="cx"> do_action( 'bp_core_loaded' );
</span><span class="cx">
</span><span class="cx"> // Activity Streams
</span><span class="lines">@@ -76,57 +84,51 @@
</span><span class="cx"> /********************************************************************************
</span><span class="cx"> * Custom Actions
</span><span class="cx"> *
</span><del>- * Functions to set up custom BuddyPress actions that all other components can
</del><ins>+ * Functions to set up custom BuddyPress actions that components should
</ins><span class="cx"> * hook in to.
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Allow plugins to include their files ahead of core filters
</del><ins>+ * Include files on this action
</ins><span class="cx"> */
</span><span class="cx"> function bp_include() {
</span><span class="cx"> do_action( 'bp_include' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_loaded', 'bp_include', 2 );
</del><span class="cx">
</span><span class="cx"> /**
</span><del>- * Allow core components and dependent plugins to set root components
</del><ins>+ * Setup BuddyPress root directory components
</ins><span class="cx"> */
</span><span class="cx"> function bp_setup_root_components() {
</span><span class="cx"> do_action( 'bp_setup_root_components' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_setup_root_components', 2 );
</del><span class="cx">
</span><span class="cx"> /**
</span><del>- * Allow core components and dependent plugins to set globals
</del><ins>+ * Setup global variables and objects
</ins><span class="cx"> */
</span><span class="cx"> function bp_setup_globals() {
</span><span class="cx"> do_action( 'bp_setup_globals' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_setup_globals', 6 );
</del><span class="cx">
</span><span class="cx"> /**
</span><del>- * Allow core components and dependent plugins to set their nav
</del><ins>+ * Set navigation elements
</ins><span class="cx"> */
</span><span class="cx"> function bp_setup_nav() {
</span><span class="cx"> do_action( 'bp_setup_nav' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_setup_nav', 8 );
</del><span class="cx">
</span><span class="cx"> /**
</span><del>- * Allow core components and dependent plugins to register widgets
</del><ins>+ * Register widgets
</ins><span class="cx"> */
</span><span class="cx"> function bp_setup_widgets() {
</span><span class="cx"> do_action( 'bp_register_widgets' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_setup_widgets', 8 );
</del><span class="cx">
</span><span class="cx"> /**
</span><del>- * Allow components to initialize themselves cleanly
</del><ins>+ * Initlialize code
</ins><span class="cx"> */
</span><span class="cx"> function bp_init() {
</span><span class="cx"> do_action( 'bp_init' );
</span><span class="cx"> }
</span><del>-add_action( 'init', 'bp_init' );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Attached to plugins_loaded
</span><span class="lines">@@ -134,7 +136,6 @@
</span><span class="cx"> function bp_loaded() {
</span><span class="cx"> do_action( 'bp_loaded' );
</span><span class="cx"> }
</span><del>-add_action( 'plugins_loaded', 'bp_loaded', 10 );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Defines BP's activation routine.
</span></span></pre>
</div>
</div>
</body>
</html>