<!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][6762] trunk/bp-core: Move bp_core_load_admin_bar() to bp_init, and also move the function itself into bp-core-adminbar.php next to bp_core_load_admin_bar_css().</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/6762">6762</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-02-04 01:35:38 +0000 (Mon, 04 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move bp_core_load_admin_bar() to bp_init, and also move the function itself into bp-core-adminbar.php next to bp_core_load_admin_bar_css(). Fixes bug causing current user to be loaded out of order. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4803">#4803</a>. See <a href="http://buddypress.trac.wordpress.org/ticket/3661">#3661</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreactionsphp">trunk/bp-core/bp-core-actions.php</a></li>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.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 (6761 => 6762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-actions.php 2013-01-30 23:36:41 UTC (rev 6761)
+++ trunk/bp-core/bp-core-actions.php 2013-02-04 01:35:38 UTC (rev 6762)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> add_action( 'bp_loaded', 'bp_setup_components', 2 );
</span><span class="cx"> add_action( 'bp_loaded', 'bp_include', 4 );
</span><span class="cx"> add_action( 'bp_loaded', 'bp_setup_widgets', 6 );
</span><del>-add_action( 'bp_loaded', 'bp_core_load_admin_bar', 10 );
</del><span class="cx"> add_action( 'bp_loaded', 'bp_register_theme_packages', 12 );
</span><span class="cx"> add_action( 'bp_loaded', 'bp_register_theme_directory', 14 );
</span><span class="cx">
</span><span class="lines">@@ -62,12 +61,14 @@
</span><span class="cx"> *
</span><span class="cx"> * Attach various initialization actions to the bp_init action.
</span><span class="cx"> * The load order helps to execute code at the correct time.
</span><del>- * v---Load order
</del><ins>+ * v---Load order
</ins><span class="cx"> */
</span><del>-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 );
</del><ins>+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 );
+add_action( 'bp_init', 'bp_core_load_admin_bar', 10 );
+add_action( 'bp_init', 'bp_core_load_admin_bar_css', 12 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_template_redirect - Attached to 'template_redirect' above
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (6761 => 6762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2013-01-30 23:36:41 UTC (rev 6761)
+++ trunk/bp-core/bp-core-adminbar.php 2013-02-04 01:35:38 UTC (rev 6762)
</span><span class="lines">@@ -44,6 +44,59 @@
</span><span class="cx"> add_action( 'admin_bar_menu', 'bp_admin_bar_my_account_root', 100 );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Handle the Toolbar/BuddyBar business
+ *
+ * @since BuddyPress (1.2)
+ *
+ * @global string $wp_version
+ * @uses bp_get_option()
+ * @uses is_user_logged_in()
+ * @uses bp_use_wp_admin_bar()
+ * @uses show_admin_bar()
+ * @uses add_action() To hook 'bp_adminbar_logo' to 'bp_adminbar_logo'
+ * @uses add_action() To hook 'bp_adminbar_login_menu' to 'bp_adminbar_menus'
+ * @uses add_action() To hook 'bp_adminbar_account_menu' to 'bp_adminbar_menus'
+ * @uses add_action() To hook 'bp_adminbar_thisblog_menu' to 'bp_adminbar_menus'
+ * @uses add_action() To hook 'bp_adminbar_random_menu' to 'bp_adminbar_menus'
+ * @uses add_action() To hook 'bp_core_admin_bar' to 'wp_footer'
+ * @uses add_action() To hook 'bp_core_admin_bar' to 'admin_footer'
+ */
+function bp_core_load_admin_bar() {
+ global $wp_version;
+
+ // Don't show if Toolbar is disabled for non-logged in users
+ if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && ! is_user_logged_in() )
+ return;
+
+ // Show the WordPress Toolbar
+ if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
+
+ // Respect user's Toolbar display preferences
+ if ( is_user_logged_in() && ( bp_get_admin_bar_pref( 'front', bp_loggedin_user_id() ) || bp_get_admin_bar_pref( 'admin', bp_loggedin_user_id() ) ) )
+ return;
+
+ show_admin_bar( true );
+
+ // Hide the WordPress Toolbar
+ } elseif ( !bp_use_wp_admin_bar() ) {
+
+ // Keep the WP Toolbar from loading
+ show_admin_bar( false );
+
+ // Actions used to build the BP Toolbar
+ add_action( 'bp_adminbar_logo', 'bp_adminbar_logo' );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu', 6 );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );
+
+ // Actions used to append BP Toolbar to footer
+ add_action( 'wp_footer', 'bp_core_admin_bar', 8 );
+ add_action( 'admin_footer', 'bp_core_admin_bar' );
+ }
+}
+
+/**
</ins><span class="cx"> * Handle the Toolbar CSS
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress 1.5
</span><span class="lines">@@ -64,4 +117,3 @@
</span><span class="cx"> if ( $min )
</span><span class="cx"> $wp_styles->add_data( 'bp-admin-bar', 'suffix', $min );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_core_load_admin_bar_css' );
</del></span></pre></div>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (6761 => 6762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2013-01-30 23:36:41 UTC (rev 6761)
+++ trunk/bp-core/bp-core-buddybar.php 2013-02-04 01:35:38 UTC (rev 6762)
</span><span class="lines">@@ -613,58 +613,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Handle the Toolbar/BuddyBar business
- *
- * @since BuddyPress (1.2)
- *
- * @global string $wp_version
- * @uses bp_get_option()
- * @uses is_user_logged_in()
- * @uses bp_use_wp_admin_bar()
- * @uses show_admin_bar()
- * @uses add_action() To hook 'bp_adminbar_logo' to 'bp_adminbar_logo'
- * @uses add_action() To hook 'bp_adminbar_login_menu' to 'bp_adminbar_menus'
- * @uses add_action() To hook 'bp_adminbar_account_menu' to 'bp_adminbar_menus'
- * @uses add_action() To hook 'bp_adminbar_thisblog_menu' to 'bp_adminbar_menus'
- * @uses add_action() To hook 'bp_adminbar_random_menu' to 'bp_adminbar_menus'
- * @uses add_action() To hook 'bp_core_admin_bar' to 'wp_footer'
- * @uses add_action() To hook 'bp_core_admin_bar' to 'admin_footer'
- */
-function bp_core_load_admin_bar() {
- global $wp_version;
-
- // Don't show if Toolbar is disabled for non-logged in users
- if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && ! is_user_logged_in() )
- return;
-
- // Show the WordPress Toolbar
- if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
-
- // Respect user's Toolbar display preferences
- if ( is_user_logged_in() && ( bp_get_admin_bar_pref( 'front', bp_loggedin_user_id() ) || bp_get_admin_bar_pref( 'admin', bp_loggedin_user_id() ) ) )
- return;
-
- show_admin_bar( true );
-
- // Hide the WordPress Toolbar
- } elseif ( !bp_use_wp_admin_bar() ) {
- // Keep the WP Toolbar from loading
- show_admin_bar( false );
-
- // Actions used to build the BP Toolbar
- add_action( 'bp_adminbar_logo', 'bp_adminbar_logo' );
- add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
- add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
- add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu', 6 );
- add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );
-
- // Actions used to append BP Toolbar to footer
- add_action( 'wp_footer', 'bp_core_admin_bar', 8 );
- add_action( 'admin_footer', 'bp_core_admin_bar' );
- }
-}
-
-/**
</del><span class="cx"> * Handle the BuddyBar CSS
</span><span class="cx"> */
</span><span class="cx"> function bp_core_load_buddybar_css() {
</span></span></pre>
</div>
</div>
</body>
</html>