<!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][6965] branches/1.7/bp-core: Fix toolbar not showing for logged out users (1.7-branch).</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/6965">6965</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2013-04-30 01:21:41 +0000 (Tue, 30 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix toolbar not showing for logged out users (1.7-branch).
See <a href="http://buddypress.trac.wordpress.org/ticket/4803">#4803</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches17bpcorebpcoreactionsphp">branches/1.7/bp-core/bp-core-actions.php</a></li>
<li><a href="#branches17bpcorebpcoreadminbarphp">branches/1.7/bp-core/bp-core-adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches17bpcorebpcoreactionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.7/bp-core/bp-core-actions.php (6964 => 6965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.7/bp-core/bp-core-actions.php 2013-04-30 01:06:41 UTC (rev 6964)
+++ branches/1.7/bp-core/bp-core-actions.php 2013-04-30 01:21:41 UTC (rev 6965)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> add_action( 'bp_init', 'bp_setup_globals', 4 );
</span><span class="cx"> add_action( 'bp_init', 'bp_setup_nav', 6 );
</span><span class="cx"> add_action( 'bp_init', 'bp_setup_title', 8 );
</span><del>-add_action( 'bp_init', 'bp_core_load_admin_bar', 10 );
</del><span class="cx"> add_action( 'bp_init', 'bp_core_load_admin_bar_css', 12 );
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="branches17bpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/1.7/bp-core/bp-core-adminbar.php (6964 => 6965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.7/bp-core/bp-core-adminbar.php 2013-04-30 01:06:41 UTC (rev 6964)
+++ branches/1.7/bp-core/bp-core-adminbar.php 2013-04-30 01:21:41 UTC (rev 6965)
</span><span class="lines">@@ -62,23 +62,13 @@
</span><span class="cx"> * @uses add_action() To hook 'bp_core_admin_bar' to 'admin_footer'
</span><span class="cx"> */
</span><span class="cx"> function bp_core_load_admin_bar() {
</span><del>- 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;
-
</del><ins>+ // Show the Toolbar for logged out users
+ if ( ! is_user_logged_in() && (int) bp_get_option( 'hide-loggedout-adminbar' ) != 1 ) {
</ins><span class="cx"> show_admin_bar( true );
</span><ins>+ }
</ins><span class="cx">
</span><del>- // Hide the WordPress Toolbar
- } elseif ( !bp_use_wp_admin_bar() ) {
</del><ins>+ // Hide the WordPress Toolbar and show the BuddyBar
+ if ( ! bp_use_wp_admin_bar() ) {
</ins><span class="cx">
</span><span class="cx"> // Keep the WP Toolbar from loading
</span><span class="cx"> show_admin_bar( false );
</span><span class="lines">@@ -95,6 +85,7 @@
</span><span class="cx"> add_action( 'admin_footer', 'bp_core_admin_bar' );
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+add_action( 'init', 'bp_core_load_admin_bar', 9 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Handle the Toolbar CSS
</span></span></pre>
</div>
</div>
</body>
</html>