<!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][3619] trunk/bp-core/bp-core-adminbar.php: Creates BP_USE_WP_ADMIN_BAR constant to allow blog admins to choose between BP-native and WP 3.1 admin bar.</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>3619</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-12-30 17:52:34 +0000 (Thu, 30 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Creates BP_USE_WP_ADMIN_BAR constant to allow blog admins to choose between BP-native and WP 3.1 admin bar. References #2706</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (3618 => 3619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2010-12-30 17:30:23 UTC (rev 3618)
+++ trunk/bp-core/bp-core-adminbar.php 2010-12-30 17:52:34 UTC (rev 3619)
</span><span class="lines">@@ -283,18 +283,34 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Actions used to build the admin bar
-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_blogs_menu', 6 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu', 6 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );
</del><ins>+function bp_core_load_admin_bar() {
+ global $wp_version;
+
+ if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR && $wp_version >= 3.1 ) {
+ // TODO: Add BP support to WP admin bar
+ return;
+ } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
+ // Keep the WP admin bar from loading
+ remove_action( 'init', 'wp_admin_bar_init' );
+
+ // Remove the WP admin bar options from user profiles
+ remove_action( 'personal_options', '_admin_bar_preferences' );
+
+ // Actions used to build the BP admin bar
+ 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_blogs_menu', 6 );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu', 6 );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
+ add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );
+
+ // Actions used to append BP admin bar to footer
+ add_action( 'wp_footer', 'bp_core_admin_bar', 8 );
+ add_action( 'admin_footer', 'bp_core_admin_bar' );
+ }
+}
+add_action( 'bp_loaded', 'bp_core_load_admin_bar' );
</ins><span class="cx">
</span><del>-// Actions used to append admin bar to footer
-add_action( 'wp_footer', 'bp_core_admin_bar', 8 );
-add_action( 'admin_footer', 'bp_core_admin_bar' );
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>