Changeset 3778 for trunk/bp-activity/bp-activity-loader.php

Timestamp:

01/21/2011 12:03:25 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Move more user functions out of core component and into user component. Fixes to loaders. More code clean-up.

File:

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

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

@@ -44 +44 @@
         $this->table_name      = $bp->table_prefix . 'bp_activity';
         $this->table_name_meta = $bp->table_prefix . 'bp_activity_meta';
+        
+        // Register this in the active components array
+        $bp->active_components[$this->id] = $this->id;
+
+        // The default text for the blogs directory search box
+        $bp->default_search_strings[$this->id] = __( 'Search Activity...', 'buddypress' );      
     }
 
@@ -69 +75 @@
         bp_core_new_nav_item( array(
             'name'                => __( 'Activity', 'buddypress' ),
-            'slug'                => $bp->activity->slug,
+            'slug'                => $this->slug,
             'position'            => 10,
             'screen_function'     => 'bp_activity_screen_my_activity',
             'default_subnav_slug' => 'just-me',
-            'item_css_id'         => $bp->activity->id )
+            'item_css_id'         => $this->id )
         );
 
@@ -83 +89 @@
         $user_domain   = ( isset( $bp->displayed_user->domain ) )               ? $bp->displayed_user->domain               : $bp->loggedin_user->domain;
         $user_login    = ( isset( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
-        $activity_link = $user_domain . $bp->activity->slug . '/';
+        $activity_link = $user_domain . $this->slug . '/';
 
         // Add the subnav items to the activity nav item if we are using a theme that supports this
@@ -90 +96 @@
             'slug'            => 'just-me',
             'parent_url'      => $activity_link,
-            'parent_slug'     => $bp->activity->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_activity_screen_my_activity',
             'position'        => 10
@@ -101 +107 @@
                 'slug'            => BP_FRIENDS_SLUG,
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $bp->activity->slug,
+                'parent_slug'     => $this->slug,
                 'screen_function' => 'bp_activity_screen_friends',
                 'position'        => 20,
@@ -114 +120 @@
                 'slug'            => BP_GROUPS_SLUG,
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $bp->activity->slug,
+                'parent_slug'     => $this->slug,
                 'screen_function' => 'bp_activity_screen_groups',
                 'position'        => 30,
@@ -126 +132 @@
             'slug'            => 'favorites',
             'parent_url'      => $activity_link,
-            'parent_slug'     => $bp->activity->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_activity_screen_favorites',
             'position'        => 40,
@@ -137 +143 @@
             'slug'            => 'mentions',
             'parent_url'      => $activity_link,
-            'parent_slug'     => $bp->activity->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_activity_screen_mentions',
             'position'        => 50,