<!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][5848] trunk: Rename bp-core-hooks.php to bp-core-actions.php; change include in bp-loader.php.</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/5848">5848</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-27 03:29:01 +0000 (Mon, 27 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename bp-core-hooks.php to bp-core-actions.php; change include in bp-loader.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreactionsphp">trunk/bp-core/bp-core-actions.php</a></li>
</ul>
<h3>Removed 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="trunkbpcorebpcoreactionsphpfromrev5847trunkbpcorebpcorehooksphp"></a>
<div class="copfile"><h4>Copied: trunk/bp-core/bp-core-actions.php (from rev 5847, trunk/bp-core/bp-core-hooks.php) (0 => 5848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-actions.php (rev 0)
+++ trunk/bp-core/bp-core-actions.php 2012-02-27 03:29:01 UTC (rev 5848)
</span><span class="lines">@@ -0,0 +1,290 @@
</span><ins>+<?php
+
+/**
+ * BuddyPress Filters & Actions
+ *
+ * @package BuddyPress
+ * @subpackage Hooks
+ *
+ * This file contains the actions and filters that are used through-out BuddyPress.
+ * They are consolidated here to make searching for them easier, and to help
+ * developers understand at a glance the order in which things occur.
+ *
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Attach BuddyPress to WordPress
+ *
+ * BuddyPress uses its own internal actions to help aid in third-party plugin
+ * development, and to limit the amount of potential future code changes when
+ * updates to WordPress core occur.
+ *
+ * These actions exist to create the concept of 'plugin dependencies'. They
+ * provide a safe way for plugins to execute code *only* when BuddyPress is
+ * installed and activated, without needing to do complicated guesswork.
+ *
+ * For more information on how this works, see the 'Plugin Dependency' section
+ * near the bottom of this file.
+ *
+ * v--WordPress Actions v--BuddyPress Sub-actions
+ */
+add_action( 'plugins_loaded', 'bp_loaded', 10 );
+add_action( 'init', 'bp_init', 10 );
+add_action( 'wp', 'bp_ready', 10 );
+add_action( 'wp_head', 'bp_head', 10 );
+add_action( 'wp_footer', 'bp_footer', 10 );
+add_action( 'setup_theme', 'bp_setup_theme', 10 );
+add_action( 'after_theme_setup', 'bp_after_theme_setup', 10 );
+add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts', 10 );
+add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 20 ); // After WP core
+add_action( 'template_redirect', 'bp_template_redirect', 10 );
+add_action( 'widgets_init', 'bp_widgets_init', 10 );
+add_filter( 'template_include', 'bp_template_include', 10 );
+add_filter( 'map_meta_cap', 'bp_map_meta_caps', 10, 4 );
+
+/**
+ * bp_loaded - Attached to 'plugins_loaded' above
+ *
+ * Attach various loader actions to the bp_loaded action.
+ * The load order helps to execute code at the correct time.
+ * v---Load order
+ */
+add_action( 'bp_loaded', 'bp_setup_components', 2 );
+add_action( 'bp_loaded', 'bp_include', 4 );
+add_action( 'bp_loaded', 'bp_setup_widgets', 6 );
+add_action( 'bp_loaded', 'bp_core_load_admin_bar', 10 );
+
+/**
+ * bp_init - Attached to 'init' above
+ *
+ * Attach various initialization actions to the bp_init action.
+ * The load order helps to execute code at the correct time.
+ * v---Load order
+ */
+add_action( 'bp_init', 'bp_core_set_uri_globals', 2 );
+add_action( 'bp_init', 'bp_setup_globals', 4 );
+add_action( 'bp_init', 'bp_setup_nav', 6 );
+add_action( 'bp_init', 'bp_setup_title', 8 );
+
+/**
+ * bp_template_redirect - Attached to 'template_redirect' above
+ *
+ * Attach various template actions to the bp_template_redirect action.
+ * The load order helps to execute code at the correct time.
+ *
+ * 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
+ */
+add_action( 'bp_template_redirect', 'bp_actions', 2 );
+add_action( 'bp_template_redirect', 'bp_screens', 4 );
+
+// Load the admin
+if ( is_admin() ) {
+ add_action( 'bp_loaded', 'bp_admin' );
+}
+
+/**
+ * Plugin Dependency
+ *
+ * The purpose of the following actions is to mimic the behavior of something
+ * called 'plugin dependency' which enables a plugin to have plugins of their
+ * own in a safe and reliable way.
+ *
+ * We do this in BuddyPress by mirroring existing WordPress actions in many places
+ * allowing dependant plugins to hook into the BuddyPress specific ones, thus
+ * guaranteeing proper code execution only whenBuddyPresss is active.
+ *
+ * The following functions are wrappers for their actions, allowing them to be
+ * manually called and/or piggy-backed on top of other actions if needed.
+ */
+
+/** Sub-actions ***************************************************************/
+
+/**
+ * Include files on this action
+ */
+function bp_include() {
+ do_action( 'bp_include' );
+}
+
+/**
+ * Include files on this action
+ */
+function bp_setup_components() {
+ do_action( 'bp_setup_components' );
+}
+
+/**
+ * Setup global variables and objects
+ */
+function bp_setup_globals() {
+ do_action( 'bp_setup_globals' );
+}
+
+/**
+ * Set navigation elements
+ */
+function bp_setup_nav() {
+ do_action( 'bp_setup_nav' );
+}
+
+/**
+ * Set up BuddyPress implementation of the WP admin bar
+ */
+function bp_setup_admin_bar() {
+ if ( bp_use_wp_admin_bar() )
+ do_action( 'bp_setup_admin_bar' );
+}
+
+/**
+ * Set the page title
+ */
+function bp_setup_title() {
+ do_action( 'bp_setup_title' );
+}
+
+/**
+ * Register widgets
+ */
+function bp_setup_widgets() {
+ do_action( 'bp_register_widgets' );
+}
+
+/**
+ * Initlialize code
+ */
+function bp_init() {
+ do_action( 'bp_init' );
+}
+
+/**
+ * Attached to plugins_loaded
+ */
+function bp_loaded() {
+ do_action( 'bp_loaded' );
+}
+
+/**
+ * Attached to wp
+ */
+function bp_ready() {
+ do_action( 'bp_ready' );
+}
+
+/**
+ * Attach potential template actions
+ */
+function bp_actions() {
+ do_action( 'bp_actions' );
+}
+
+/**
+ * Attach potential template screens
+ */
+function bp_screens() {
+ do_action( 'bp_screens' );
+}
+
+/**
+ * Initialize widgets
+ */
+function bp_widgets_init() {
+ do_action ( 'bp_widgets_init' );
+}
+
+/** 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' );
+}
+
+/**
+ * Enqueue BuddyPress specific CSS and JS
+ *
+ * @since BuddyPress (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 before the theme has
+ * been setup and the theme's functions.php has loaded.
+ *
+ * @since BuddyPress (r5812)
+ *
+ * @uses do_action() Calls 'bp_setup_theme'
+ */
+function bp_setup_theme() {
+ do_action ( 'bp_setup_theme' );
+}
+
+/**
+ * Piggy back action for BuddyPress sepecific theme actions once the theme has
+ * been setup and the theme's functions.php has loaded.
+ *
+ * @since BuddyPress (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></pre></div>
<a id="trunkbpcorebpcorehooksphp"></a>
<div class="delfile"><h4>Deleted: trunk/bp-core/bp-core-hooks.php (5847 => 5848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-hooks.php 2012-02-27 03:23:41 UTC (rev 5847)
+++ trunk/bp-core/bp-core-hooks.php 2012-02-27 03:29:01 UTC (rev 5848)
</span><span class="lines">@@ -1,292 +0,0 @@
</span><del>-<?php
-
-/**
- * BuddyPress Filters & Actions
- *
- * @package BuddyPress
- * @subpackage Hooks
- *
- * This file contains the actions and filters that are used through-out BuddyPress.
- * They are consolidated here to make searching for them easier, and to help
- * developers understand at a glance the order in which things occur.
- *
- */
-
-// Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
-
-/** ACTIONS *******************************************************************/
-
-/**
- * Attach BuddyPress to WordPress
- *
- * BuddyPress uses its own internal actions to help aid in third-party plugin
- * development, and to limit the amount of potential future code changes when
- * updates to WordPress core occur.
- *
- * These actions exist to create the concept of 'plugin dependencies'. They
- * provide a safe way for plugins to execute code *only* when BuddyPress is
- * installed and activated, without needing to do complicated guesswork.
- *
- * For more information on how this works, see the 'Plugin Dependency' section
- * near the bottom of this file.
- *
- * v--WordPress Actions v--BuddyPress Sub-actions
- */
-add_action( 'plugins_loaded', 'bp_loaded', 10 );
-add_action( 'init', 'bp_init', 10 );
-add_action( 'wp', 'bp_ready', 10 );
-add_action( 'wp_head', 'bp_head', 10 );
-add_action( 'wp_footer', 'bp_footer', 10 );
-add_action( 'setup_theme', 'bp_setup_theme', 10 );
-add_action( 'after_theme_setup', 'bp_after_theme_setup', 10 );
-add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts', 10 );
-add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 20 ); // After WP core
-add_action( 'template_redirect', 'bp_template_redirect', 10 );
-add_action( 'widgets_init', 'bp_widgets_init', 10 );
-add_filter( 'template_include', 'bp_template_include', 10 );
-add_filter( 'map_meta_cap', 'bp_map_meta_caps', 10, 4 );
-
-/**
- * bp_loaded - Attached to 'plugins_loaded' above
- *
- * Attach various loader actions to the bp_loaded action.
- * The load order helps to execute code at the correct time.
- * v---Load order
- */
-add_action( 'bp_loaded', 'bp_setup_components', 2 );
-add_action( 'bp_loaded', 'bp_include', 4 );
-add_action( 'bp_loaded', 'bp_setup_widgets', 6 );
-add_action( 'bp_loaded', 'bp_core_load_admin_bar', 10 );
-
-/**
- * bp_init - Attached to 'init' above
- *
- * Attach various initialization actions to the bp_init action.
- * The load order helps to execute code at the correct time.
- * v---Load order
- */
-add_action( 'bp_init', 'bp_core_set_uri_globals', 2 );
-add_action( 'bp_init', 'bp_setup_globals', 4 );
-add_action( 'bp_init', 'bp_setup_nav', 6 );
-add_action( 'bp_init', 'bp_setup_title', 8 );
-
-/**
- * bp_template_redirect - Attached to 'template_redirect' above
- *
- * Attach various template actions to the bp_template_redirect action.
- * The load order helps to execute code at the correct time.
- *
- * 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
- */
-add_action( 'bp_template_redirect', 'bp_actions', 2 );
-add_action( 'bp_template_redirect', 'bp_screens', 4 );
-
-// Load the admin
-if ( is_admin() ) {
- add_action( 'bp_loaded', 'bp_admin' );
-}
-
-/**
- * Plugin Dependency
- *
- * The purpose of the following actions is to mimic the behavior of something
- * called 'plugin dependency' which enables a plugin to have plugins of their
- * own in a safe and reliable way.
- *
- * We do this in BuddyPress by mirroring existing WordPress actions in many places
- * allowing dependant plugins to hook into the BuddyPress specific ones, thus
- * guaranteeing proper code execution only whenBuddyPresss is active.
- *
- * The following functions are wrappers for their actions, allowing them to be
- * manually called and/or piggy-backed on top of other actions if needed.
- */
-
-/** The hooks *****************************************************************/
-
-/**
- * Include files on this action
- */
-function bp_include() {
- do_action( 'bp_include' );
-}
-
-/**
- * Include files on this action
- */
-function bp_setup_components() {
- do_action( 'bp_setup_components' );
-}
-
-/**
- * Setup global variables and objects
- */
-function bp_setup_globals() {
- do_action( 'bp_setup_globals' );
-}
-
-/**
- * Set navigation elements
- */
-function bp_setup_nav() {
- do_action( 'bp_setup_nav' );
-}
-
-/**
- * Set up BuddyPress implementation of the WP admin bar
- */
-function bp_setup_admin_bar() {
- if ( bp_use_wp_admin_bar() )
- do_action( 'bp_setup_admin_bar' );
-}
-
-/**
- * Set the page title
- */
-function bp_setup_title() {
- do_action( 'bp_setup_title' );
-}
-
-/**
- * Register widgets
- */
-function bp_setup_widgets() {
- do_action( 'bp_register_widgets' );
-}
-
-/**
- * Initlialize code
- */
-function bp_init() {
- do_action( 'bp_init' );
-}
-
-/**
- * Attached to plugins_loaded
- */
-function bp_loaded() {
- do_action( 'bp_loaded' );
-}
-
-/**
- * Attached to wp
- */
-function bp_ready() {
- do_action( 'bp_ready' );
-}
-
-/**
- * Attach potential template actions
- */
-function bp_actions() {
- do_action( 'bp_actions' );
-}
-
-/**
- * Attach potential template screens
- */
-function bp_screens() {
- do_action( 'bp_screens' );
-}
-
-/**
- * Initialize widgets
- */
-function bp_widgets_init() {
- do_action ( 'bp_widgets_init' );
-}
-
-/** 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' );
-}
-
-/**
- * Enqueue BuddyPress specific CSS and JS
- *
- * @since BuddyPress (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 before the theme has
- * been setup and the theme's functions.php has loaded.
- *
- * @since BuddyPress (r5812)
- *
- * @uses do_action() Calls 'bp_setup_theme'
- */
-function bp_setup_theme() {
- do_action ( 'bp_setup_theme' );
-}
-
-/**
- * Piggy back action for BuddyPress sepecific theme actions once the theme has
- * been setup and the theme's functions.php has loaded.
- *
- * @since BuddyPress (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' );
-}
-
-?>
</del></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (5847 => 5848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2012-02-27 03:23:41 UTC (rev 5847)
+++ trunk/bp-loader.php 2012-02-27 03:29:01 UTC (rev 5848)
</span><span class="lines">@@ -490,9 +490,9 @@
</span><span class="cx"> if ( empty( $this->maintenance_mode ) ) {
</span><span class="cx">
</span><span class="cx"> // Require all of the BuddyPress core libraries
</span><ins>+ require( $this->plugin_dir . 'bp-core/bp-core-actions.php' );
</ins><span class="cx"> require( $this->plugin_dir . 'bp-core/bp-core-caps.php' );
</span><span class="cx"> require( $this->plugin_dir . 'bp-core/bp-core-cache.php' );
</span><del>- require( $this->plugin_dir . 'bp-core/bp-core-hooks.php' );
</del><span class="cx"> require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php' );
</span><span class="cx"> require( $this->plugin_dir . 'bp-core/bp-core-update.php' );
</span><span class="cx"> require( $this->plugin_dir . 'bp-core/bp-core-options.php' );
</span></span></pre>
</div>
</div>
</body>
</html>