<!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][4631] trunk/bp-core: Introduces bp_use_wp_admin_bar() to reduce BP_USE_WP_ADMIN_BAR checks throughout BP.</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>4631</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-09 19:24:36 +0000 (Sat, 09 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduces bp_use_wp_admin_bar() to reduce BP_USE_WP_ADMIN_BAR checks throughout BP. See #3314</pre>
<h3>Modified Paths</h3>
<ul>
<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>
<li><a href="#trunkbpcorebpcorecomponentphp">trunk/bp-core/bp-core-component.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcorehooksphp">trunk/bp-core/bp-core-hooks.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 (4630 => 4631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2011-07-09 19:14:50 UTC (rev 4630)
+++ trunk/bp-core/bp-core-adminbar.php 2011-07-09 19:24:36 UTC (rev 4631)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> * @subpackage Core
</span><span class="cx"> */
</span><span class="cx">
</span><del>-if ( !defined( 'BP_USE_WP_ADMIN_BAR' ) || defined( 'DOING_AJAX' ) )
</del><ins>+if ( !bp_use_wp_admin_bar() || defined( 'DOING_AJAX' ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (4630 => 4631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2011-07-09 19:14:50 UTC (rev 4630)
+++ trunk/bp-core/bp-core-buddybar.php 2011-07-09 19:24:36 UTC (rev 4631)
</span><span class="lines">@@ -509,11 +509,11 @@
</span><span class="cx"> global $wp_version;
</span><span class="cx">
</span><span class="cx"> // Show the WordPress admin bar
</span><del>- if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR && $wp_version >= 3.1 ) {
</del><ins>+ if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
</ins><span class="cx"> show_admin_bar( true );
</span><span class="cx">
</span><span class="cx"> // Hide the WordPress admin bar
</span><del>- } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
</del><ins>+ } elseif ( !bp_use_wp_admin_bar() ) {
</ins><span class="cx">
</span><span class="cx"> // Keep the WP admin bar from loading
</span><span class="cx"> show_admin_bar( false );
</span></span></pre></div>
<a id="trunkbpcorebpcorecomponentphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-component.php (4630 => 4631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-component.php 2011-07-09 19:14:50 UTC (rev 4630)
+++ trunk/bp-core/bp-core-component.php 2011-07-09 19:24:36 UTC (rev 4631)
</span><span class="lines">@@ -250,8 +250,8 @@
</span><span class="cx"> if ( defined( 'DOING_AJAX' ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Do not proceed if constant is not set or is false
- if ( !defined( 'BP_USE_WP_ADMIN_BAR' ) || !BP_USE_WP_ADMIN_BAR )
</del><ins>+ // Do not proceed if BP_USE_WP_ADMIN_BAR constant is not set or is false
+ if ( !bp_use_wp_admin_bar() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Do we have admin bar menus to add?
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4630 => 4631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-07-09 19:14:50 UTC (rev 4630)
+++ trunk/bp-core/bp-core-functions.php 2011-07-09 19:24:36 UTC (rev 4631)
</span><span class="lines">@@ -1234,6 +1234,25 @@
</span><span class="cx"> return apply_filters( 'bp_is_multiblog_mode', is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Should we use the WP admin bar?
+ *
+ * The WP Admin Bar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.3.
+ *
+ * For the BP 1.3 development cycle, the BuddyBar will remain the default navigation for BP
+ * installations. In the future, this behavior will be changed, so that the WP Admin Bar is the
+ * default.
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @uses apply_filters() Filter 'bp_use_wp_admin_bar' to alter
+ * @return bool False when WP Admin Bar support is disabled (default); true when enabled
+ */
+function bp_use_wp_admin_bar() {
+ return apply_filters( 'bp_use_wp_admin_bar', defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR );
+}
+
</ins><span class="cx"> /** Global Manipulators *******************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpcorebpcorehooksphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-hooks.php (4630 => 4631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-hooks.php 2011-07-09 19:14:50 UTC (rev 4630)
+++ trunk/bp-core/bp-core-hooks.php 2011-07-09 19:24:36 UTC (rev 4631)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> * Set up BuddyPress implementation of the WP admin bar
</span><span class="cx"> */
</span><span class="cx"> function bp_setup_admin_bar() {
</span><del>- if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR )
</del><ins>+ if ( bp_use_wp_admin_bar() )
</ins><span class="cx"> do_action( 'bp_setup_admin_bar' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>