<!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][7277] trunk: Make declarations of each components' methods compatible with those in the BP_Component class.</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/7277">7277</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2013-07-17 08:19:25 +0000 (Wed, 17 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make declarations of each components' methods compatible with those in the BP_Component class.

Fixes standards warnings on PHP 5.4</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpblogsbpblogsloaderphp">trunk/bp-blogs/bp-blogs-loader.php</a></li>
<li><a href="#trunkbpcorebpcoreloaderphp">trunk/bp-core/bp-core-loader.php</a></li>
<li><a href="#trunkbpforumsbpforumsloaderphp">trunk/bp-forums/bp-forums-loader.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsloaderphp">trunk/bp-friends/bp-friends-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpmembersbpmembersloaderphp">trunk/bp-members/bp-members-loader.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesloaderphp">trunk/bp-messages/bp-messages-loader.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileloaderphp">trunk/bp-xprofile/bp-xprofile-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-activity/bp-activity-loader.php    2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx">           // Files to include
</span><span class="cx">          $includes = array(
</span><span class="cx">                  'actions',
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global object $bp BuddyPress global settings
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Define a slug, if necessary
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">   * @uses bp_get_friends_slug()
</span><span class="cx">   * @uses bp_get_groups_slug()
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          $sub_nav = array();
</span><span class="cx"> 
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">   * @uses bp_get_friends_slug()
</span><span class="cx">   * @uses bp_get_groups_slug()
</span><span class="cx">   */
</span><del>-       function setup_admin_bar() {
</del><ins>+        public function setup_admin_bar( $wp_admin_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Prevent debug notices
</span></span></pre></div>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php       2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-blogs/bp-blogs-loader.php  2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          if ( !defined( 'BP_BLOGS_SLUG' ) )
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Include files
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx">           // Files to include
</span><span class="cx">          $includes = array(
</span><span class="cx">                  'cache',
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          /**
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_admin_bar() {
</del><ins>+        public function setup_admin_bar( $wp_admin_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          /**
</span></span></pre></div>
<a id="trunkbpcorebpcoreloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-loader.php 2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-core/bp-core-loader.php    2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">          $bp->required_components[] = 'core';
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          if ( !is_admin() )
</span><span class="cx">                  return;
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          /** Database **********************************************************/
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">           // If xprofile component is disabled, revert to WordPress profile
</span></span></pre></div>
<a id="trunkbpforumsbpforumsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-loader.php     2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-forums/bp-forums-loader.php        2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           $bp = buddypress();
</span><span class="cx"> 
</span><span class="cx">          // Define the parent forum ID
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Include files
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          // Files to include
</span><span class="cx">          $includes = array(
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Setup BuddyBar navigation
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          // Stop if forums haven't been set up yet
</span><span class="cx">          if ( !bp_forums_is_installed_correctly() )
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Set up the Toolbar
</span><span class="cx">   */
</span><del>-       function setup_admin_bar() {
</del><ins>+        public function setup_admin_bar( $wp_admin_nav = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          // Prevent debug notices
</span><span class="cx">          $wp_admin_nav = array();
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-loader.php   2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-friends/bp-friends-loader.php      2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Include files
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx">           // Files to include
</span><span class="cx">          $includes = array(
</span><span class="cx">                  'actions',
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          define ( 'BP_FRIENDS_DB_VERSION', '1800' );
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          $sub_nav = array();
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_admin_bar() {
</del><ins>+        public function setup_admin_bar( $wp_admin_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Prevent debug notices
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php     2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-groups/bp-groups-loader.php        2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Include files
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx">           $includes = array(
</span><span class="cx">                  'cache',
</span><span class="cx">                  'forums',
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Define a slug, if necessary
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          // Define local variables
</span><span class="cx">          $sub_nav = array();
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_admin_bar() {
</del><ins>+        public function setup_admin_bar( $wp_admin_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Prevent debug notices
</span></span></pre></div>
<a id="trunkbpmembersbpmembersloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-loader.php   2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-members/bp-members-loader.php      2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx">           $includes = array(
</span><span class="cx">                  'actions',
</span><span class="cx">                  'filters',
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Define a slug, if necessary
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Add 'Profile' to the main navigation
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-loader.php 2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-messages/bp-messages-loader.php    2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Include files
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx">           // Files to include
</span><span class="cx">          $includes = array(
</span><span class="cx">                  'cssjs',
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Define a slug, if necessary
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          $sub_nav = array();
</span><span class="cx">          $name    = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_admin_bar() {
</del><ins>+        public function setup_admin_bar( $wp_admin_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Prevent debug notices
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (7276 => 7277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2013-07-16 19:35:17 UTC (rev 7276)
+++ trunk/bp-xprofile/bp-xprofile-loader.php    2013-07-17 08:19:25 UTC (rev 7277)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">  /**
</span><span class="cx">   * Include files
</span><span class="cx">   */
</span><del>-       function includes() {
</del><ins>+        public function includes( $includes = array() ) {
</ins><span class="cx">           $includes = array(
</span><span class="cx">                  'cssjs',
</span><span class="cx">                  'cache',
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">   * @since BuddyPress (1.5)
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_globals() {
</del><ins>+        public function setup_globals( $args = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Define a slug, if necessary
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_nav() {
</del><ins>+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
</ins><span class="cx"> 
</span><span class="cx">          $sub_nav = array();
</span><span class="cx"> 
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">   *
</span><span class="cx">   * @global BuddyPress $bp The one true BuddyPress instance
</span><span class="cx">   */
</span><del>-       function setup_admin_bar() {
</del><ins>+        public function setup_admin_bar( $wp_admin_nav = array() ) {
</ins><span class="cx">           global $bp;
</span><span class="cx"> 
</span><span class="cx">          // Prevent debug notices
</span></span></pre>
</div>
</div>

</body>
</html>