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

Timestamp:

01/25/2011 08:58:56 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Rename new 'bp-users' component to 'bp-members' for consistency through-out project.
Core, Messages, and Friends Components now use the BP_Component class.
Split Friends and Messages components into smaller files.
Change references to 'profile' to 'xprofile' through-out project for consistency.
Introduce 'bp_actions' and 'bp_screens' standard hooks to replace the usage of 'wp' through-out project.
Move component loader sequence into bp-core-bootstrap.php,
Move old root_component action into 1.3 deprecated file.

File:

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

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

@@ -18 +18 @@
      */
     function BP_Forums_Component() {
-        parent::start( 'forums', __( 'Discussion Forums', 'buddypress' ) );
+        parent::start(
+            'forums',
+            __( 'Discussion Forums', 'buddypress' ),
+            BP_PLUGIN_DIR
+        );
     }
 
@@ -41 +45 @@
             define( 'BP_FORUMS_SLUG', $this->id );
 
-        // Do some slug checks
-        $this->slug      = BP_FORUMS_SLUG;
-        $this->root_slug = isset( $bp->pages->forums->slug ) ? $bp->pages->forums->slug : $this->slug;
-
         // The location of the bbPress stand-alone config file
         if ( isset( $bp->site_options['bb-config-location'] ) )
             $this->bbconfig = $bp->site_options['bb-config-location'];
 
-        // The default text for the blogs directory search box
-        $this->default_search_string = __( 'Search Forums...', 'buddypress' );
+        // All globals for messaging component.
+        // Note that global_tables is included in this array.
+        $globals = array(
+            'slug'                  => BP_FORUMS_SLUG,
+            'root_slug'             => isset( $bp->pages->forums->slug ) ? $bp->pages->forums->slug : BP_FORUMS_SLUG,
+            'notification_callback' => 'messages_format_notifications',
+            'search_string'         => __( 'Search Forums...', 'buddypress' ),
+        );
 
-        // Register this in the active components array
-        $bp->active_components[$this->id] = $this->id;
+        parent::_setup_globals( $globals );
     }
 
@@ -61 +66 @@
     function _includes() {
 
-        // Support for bbPress stand-alone
+        // Files to include
+        $includes = array(
+            'actions',
+            'screens',
+            'classes',
+            'filters',
+            'template',
+            'functions',
+        );
+
+        // Admin area
+        if ( is_admin() )
+            $includes[] = 'admin';
+
+        // bbPress stand-alone
         if ( !defined( 'BB_PATH' ) )
-            require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress-sa.php' );
+            $includes[] = 'bbpress-sa';
 
-        // Admin
-        if ( is_admin() )
-            require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php'   );
-
-        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-actions.php'   );
-        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-screens.php'   );
-        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-filters.php'   );
-        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-template.php'  );
-        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-functions.php' );
+        parent::_includes( $includes );
     }
 
@@ -85 +96 @@
 
         // Add 'Forums' to the main navigation
-        bp_core_new_nav_item( array(
+        $main_nav = array(
             'name'                => __( 'Forums', 'buddypress' ),
             'slug'                => $this->slug,
@@ -91 +102 @@
             'screen_function'     => 'bp_forums_screen_topics',
             'default_subnav_slug' => 'topics',
-            'item_css_id'         => $this->id )
+            'item_css_id'         => $this->id
         );
 
@@ -113 +124 @@
 
         // Additional menu if friends is active
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Topics Started', 'buddypress' ),
             'slug'            => 'topics',
@@ -121 +132 @@
             'position'        => 20,
             'item_css_id'     => 'forums-friends'
-        ) );
+        );
 
         // Additional menu if friends is active
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Replies', 'buddypress' ),
             'slug'            => 'replies',
@@ -132 +143 @@
             'position'        => 40,
             'item_css_id'     => 'forums-friends'
-        ) );
+        );
 
         // Favorite forums items
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Favorite Topics', 'buddypress' ),
             'slug'            => 'favorites',
@@ -143 +154 @@
             'position'        => 60,
             'item_css_id'     => 'forums-favs'
-        ) );
+        );
+
+        parent::_setup_nav( $main_nav, $sub_nav );
+    }
+
+    /**
+     * Sets up the title for pages and <title>
+     *
+     * @global obj $bp
+     */
+    function _setup_title() {
+        global $bp;
 
         // Adjust title based on view
@@ -157 +179 @@
             }
         }
+
+        parent::_setup_title();
     }
 }