Changeset 6581 for trunk/bp-forums/bp-forums-loader.php

Timestamp:

12/10/2012 08:25:00 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Legacy Group Forums:

• Retire bbPress 1.1 group forums component.
• Creates new "Retired" components group, where old components go to die.
• Deprecate "Forums" settings tab; use Legacy Forums Setting instead.
• Remove associated code for old forums admin UI.
• See #4493.
• Fixes #3598.

File:

• trunk/bp-forums/bp-forums-loader.php (modified) (8 diffs)

trunk/bp-forums/bp-forums-loader.php

@@ -35 +35 @@
          *
          * @since BuddyPress (1.5)
-         * @global BuddyPress $bp The one true BuddyPress instance
          */
         function setup_globals() {
-                global $bp;
+                $bp = buddypress();
 
                 // Define the parent forum ID
@@ -80 +79 @@
                 );
 
-                // Admin area
-                if ( is_admin() )
-                        $includes[] = 'admin';
-
                 // bbPress stand-alone
                 if ( !defined( 'BB_PATH' ) )
@@ -93 +88 @@
         /**
          * Setup BuddyBar navigation
-         *
-         * @global BuddyPress $bp The one true BuddyPress instance
          */
         function setup_nav() {
-                global $bp;
 
                 // Stop if forums haven't been set up yet
@@ -151 +143 @@
                 );
 
-                // Favorite forums items. Disabled until future release.
-                /*
-                $sub_nav[] = array(
-                        'name'            => __( 'Favorites', 'buddypress' ),
-                        'slug'            => 'favorites',
-                        'parent_url'      => $forums_link,
-                        'parent_slug'     => $this->slug,
-                        'screen_function' => 'bp_member_forums_screen_favorites',
-                        'position'        => 60,
-                        'item_css_id'     => 'favorites'
-                );
-                */
-
                 parent::setup_nav( $main_nav, $sub_nav );
         }
@@ -169 +148 @@
         /**
          * Set up the Toolbar
-         *
-         * @global BuddyPress $bp The one true BuddyPress instance
          */
         function setup_admin_bar() {
-                global $bp;
 
                 // Prevent debug notices
@@ -186 +162 @@
                         // Add the "My Account" sub menus
                         $wp_admin_nav[] = array(
-                                'parent' => $bp->my_account_menu_id,
+                                'parent' => buddypress()->my_account_menu_id,
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => __( 'Forums', 'buddypress' ),
@@ -222 +198 @@
         /**
          * Sets up the title for pages and <title>
-         *
-         * @global BuddyPress $bp The one true BuddyPress instance
          */
         function setup_title() {
-                global $bp;
+                $bp = buddypress();
 
                 // Adjust title based on view
@@ -247 +221 @@
 
 function bp_setup_forums() {
-        global $bp;
-
-        $bp->forums = new BP_Forums_Component();
+        buddypress()->forums = new BP_Forums_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_forums', 6 );