<!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][4155] trunk: Force WordPress admin bar to show when user is not logged in, if BP_USE_WP_ADMIN_BAR constant is set.</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>4155</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-03-24 06:28:47 +0000 (Thu, 24 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Force WordPress admin bar to show when user is not logged in, if BP_USE_WP_ADMIN_BAR constant is set. Also include Root Blog, Log in, and Register links.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpmembersbpmembersadminbarphp">trunk/bp-members/bp-members-adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (4154 => 4155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2011-03-24 05:58:12 UTC (rev 4154)
+++ trunk/bp-core/bp-core-buddybar.php 2011-03-24 06:28:47 UTC (rev 4155)
</span><span class="lines">@@ -463,14 +463,23 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Handle the Admin Bar/BuddyBar business
+ *
+ * @todo Clean up global constants
+ *
+ * @global num $wp_version
+ */
</ins><span class="cx"> function bp_core_load_admin_bar() {
</span><span class="cx"> global $wp_version;
</span><span class="cx">
</span><ins>+ // Show the WordPress admin bar
</ins><span class="cx"> if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR && $wp_version >= 3.1 ) {
</span><del>- // TODO: Add BP support to WP admin bar
- return;
</del><ins>+ show_admin_bar( true );
</ins><span class="cx">
</span><ins>+ // Hide the WordPress admin bar
</ins><span class="cx"> } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
</span><ins>+
</ins><span class="cx"> // Keep the WP admin bar from loading
</span><span class="cx"> show_admin_bar( false );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-adminbar.php (4154 => 4155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-adminbar.php 2011-03-24 05:58:12 UTC (rev 4154)
+++ trunk/bp-members/bp-members-adminbar.php 2011-03-24 06:28:47 UTC (rev 4155)
</span><span class="lines">@@ -17,6 +17,13 @@
</span><span class="cx"> function bp_members_admin_bar_my_account_menu() {
</span><span class="cx"> global $bp, $wp_admin_bar;
</span><span class="cx">
</span><ins>+ // Create the root blog menu
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'bp-root-blog',
+ 'title' => get_blog_option( BP_ROOT_BLOG, 'blogname' ),
+ 'href' => bp_get_root_domain()
+ ) );
+
</ins><span class="cx"> // Logged in user
</span><span class="cx"> if ( is_user_logged_in() ) {
</span><span class="cx">
</span><span class="lines">@@ -37,6 +44,27 @@
</span><span class="cx"> 'title' => $avatar . bp_get_user_firstname(),
</span><span class="cx"> 'href' => bp_core_get_user_domain( $bp->loggedin_user->id )
</span><span class="cx"> ) );
</span><ins>+
+ // Show login and sign-up links
+ } elseif ( !empty( $wp_admin_bar ) ) {
+
+ add_filter ( 'show_admin_bar', '__return_true' );
+
+ // Create the main 'My Account' menu
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'bp-login',
+ 'title' => __( 'Log in', 'buddypress' ),
+ 'href' => wp_login_url()
+ ) );
+
+ // Sign up
+ if ( bp_get_signup_allowed() ) {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'bp-register',
+ 'title' => __( 'Register', 'buddypress' ),
+ 'href' => bp_get_signup_page()
+ ) );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( defined( 'BP_USE_WP_ADMIN_BAR' ) )
</span></span></pre>
</div>
</div>
</body>
</html>