Changeset 7347 for trunk/bp-activity/bp-activity-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-activity/bp-activity-loader.php (modified) (8 diffs)

trunk/bp-activity/bp-activity-loader.php

@@ -53 +53 @@
         // Load Akismet support if Akismet is configured
         $akismet_key = bp_get_option( 'wordpress_api_key' );
-        if ( defined( 'AKISMET_VERSION' ) && ( !empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) && apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) )
+        if ( defined( 'AKISMET_VERSION' ) && ( !empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) && apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
             $includes[] = 'akismet';
-
-        if ( is_admin() )
+        }
+
+        if ( is_admin() ) {
             $includes[] = 'admin';
+        }
 
         parent::includes( $includes );
@@ -69 +71 @@
      *
      * @since BuddyPress (1.5)
-     *
-     * @global object $bp BuddyPress global settings
      */
     public function setup_globals( $args = array() ) {
-        global $bp;
+        $bp = buddypress();
 
         // Define a slug, if necessary
@@ -87 +87 @@
         // All globals for activity component.
         // Note that global_tables is included in this array.
-        $globals = array(
+        $args = array(
             'slug'                  => BP_ACTIVITY_SLUG,
             'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
@@ -96 +96 @@
         );
 
-        parent::setup_globals( $globals );
+        parent::setup_globals( $args );
     }
 
@@ -111 +111 @@
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-        $sub_nav = array();
 
         // Add 'Activity' to the main navigation
@@ -218 +216 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        global $bp;
-
-        // Prevent debug notices
-        $wp_admin_nav = array();
+        $bp = buddypress();
 
         // Menus for logged in user
@@ -309 +304 @@
      */
     function setup_title() {
-        global $bp;
+        $bp = buddypress();
 
         // Adjust title based on view
@@ -342 +337 @@
 
 function bp_setup_activity() {
-    global $bp;
-
-    $bp->activity = new BP_Activity_Component();
+    buddypress()->activity = new BP_Activity_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_activity', 6 );