Changeset 7347 for trunk/bp-core/bp-core-loader.php

Timestamp:

08/12/2013 10:30:52 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Audit loader classes, and remove $bp global touches in lieu of using the buddypress() function. Also some whitespace clean-up.

File:

• trunk/bp-core/bp-core-loader.php (modified) (4 diffs)

trunk/bp-core/bp-core-loader.php

@@ -39 +39 @@
      *
      * @since BuddyPress (1.5)
-     *
-     * @global BuddyPress $bp
      */
     private function bootstrap() {
-        global $bp;
+        $bp = buddypress();
 
         /**
@@ -128 +126 @@
      *
      * @since BuddyPress (1.5)
-     *
-     * @global BuddyPress $bp
      */
     public function setup_globals( $args = array() ) {
-        global $bp;
+        $bp = buddypress();
 
         /** Database **********************************************************/
@@ -192 +188 @@
      *
      * @since BuddyPress (1.5)
-     *
-     * @global BuddyPress $bp
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-        global $bp;
+        $bp = buddypress();
 
          // If xprofile component is disabled, revert to WordPress profile
         if ( !bp_is_active( 'xprofile' ) ) {
-
-            // Define local variable
-            $sub_nav = array();
 
             // Fallback values if xprofile is disabled
@@ -244 +235 @@
  */
 function bp_setup_core() {
-    global $bp;
-    $bp->core = new BP_Core();
+    buddypress()->core = new BP_Core();
 }
 add_action( 'bp_setup_components', 'bp_setup_core', 2 );