Changeset 1250 for trunk/bp-groups.php

Timestamp:

03/25/2009 04:01:43 PM (16 years ago)

Author:

apeatling

Message:

Removed blogs, groups and members directory from the home theme into the BuddyPress member theme. The directories now have their own templates and theme based CSS and provide much easier editing.

Moved the $bp global setup to a higher priority action - from the 'wp' action to the 'plugins_loaded' action. This stops occurrences where the $bp global was not defined yet.

File:

• trunk/bp-groups.php (modified) (9 diffs)

trunk/bp-groups.php

@@ -26 +26 @@
 require ( 'bp-groups/bp-groups-filters.php' );
 require ( 'bp-groups/bp-groups-admin.php' );
-require ( 'bp-groups/directories/bp-groups-directory-groups.php' );
 
 /**************************************************************************
@@ -142 +141 @@
         $bp->groups->table_name_wire = $wpdb->base_prefix . 'bp_groups_wire';
     
-    $bp->groups->forbidden_names = array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' );
+    $bp->groups->forbidden_names = apply_filters( 'groups_forbidden_names', array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' ) );
     $bp->version_numbers->groups = BP_GROUPS_VERSION;
     
     return $bp;
 }
-add_action( 'wp', 'groups_setup_globals', 1, false );   
-add_action( 'admin_menu', 'groups_setup_globals', 1, false );
+add_action( 'plugins_loaded', 'groups_setup_globals', 5 );  
+add_action( 'admin_menu', 'groups_setup_globals', 1 );
 
 function groups_setup_root_component() {
@@ -154 +153 @@
     bp_core_add_root_component( BP_GROUPS_SLUG );
 }
-add_action( 'plugins_loaded', 'groups_setup_root_component' );
+add_action( 'plugins_loaded', 'groups_setup_root_component', 1 );
 
 function groups_check_installed() { 
@@ -169 +168 @@
 }
 add_action( 'admin_menu', 'groups_check_installed' );
-
 
 function groups_add_admin_menu() {
@@ -248 +246 @@
             array_shift($bp->action_variables);
                                     
-            $bp->bp_options_title = bp_create_excerpt( $group_obj->name, 1 );
+            $bp->bp_options_title = $group_obj->name;
             $bp->bp_options_avatar = '<img src="' . $group_obj->avatar_thumb . '" alt="Group Avatar Thumbnail" />';
             
@@ -301 +299 @@
 add_action( 'admin_menu', 'groups_setup_nav', 2 );
 
+function groups_directory_groups_setup() {
+    global $bp;
+    
+    if ( $bp->current_component == $bp->groups->slug && empty( $bp->current_action ) ) {
+        $bp->is_directory = true;
+
+        wp_enqueue_script( 'bp-groups-directory-groups', WPMU_PLUGIN_URL . '/bp-groups/js/directory-groups.js', array( 'jquery', 'jquery-livequery-pack' ) );
+        bp_core_load_template( 'directories/groups/index' );
+    }
+}
+add_action( 'wp', 'groups_directory_groups_setup', 5 );
 
 /***** Screens **********/
@@ -2249 +2258 @@
 
 function groups_force_buddypress_theme( $template ) {
-    global $current_component, $current_action;
-    global $is_member_page, $bp;
-
-    $groups_bp = groups_setup_globals(true);
-    
-    if ( $current_component != $groups_bp->groups->slug )
+    global $bp;
+    
+    if ( $bp->current_component != $bp->groups->slug )
         return $template;
     
@@ -2261 +2267 @@
     if ( empty($member_theme) )
         $member_theme = 'buddypress-member';
-    
-    // The theme filter does not recognize any globals, where as the stylesheet filter does.
-    // We have to set up the globals to use manually.
-    bp_core_set_uri_globals();
-
-    if ( $current_component == $groups_bp->groups->slug )
-        $bp->is_single_item = BP_Groups_Group::group_exists( $current_action, $groups_bp->groups->table_name );
-    
-    if ( $bp->is_single_item ) {
-        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
-        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
-
-        return $member_theme;
-    } else {
-        return $template;
-    }
-    
-    return $theme;
-}
-add_filter( 'template', 'groups_force_buddypress_theme', 1, 1 );
+
+    add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+    add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+
+    return $member_theme;
+}
+add_filter( 'template', 'groups_force_buddypress_theme' );
 
 function groups_force_buddypress_stylesheet( $stylesheet ) {
-    global $bp, $is_member_page, $current_component;
-
-    if ( $current_component != $bp->groups->slug )
+    global $bp;
+
+    if ( $bp->current_component != $bp->groups->slug )
         return $stylesheet;
 
@@ -2293 +2286 @@
         $member_theme = 'buddypress-member';
     
-    if ( $bp->is_single_item ) {
-        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
-        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
-        
-        return $member_theme;
-    } else {
-        return $stylesheet; 
-    }
+    add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+    add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+    
+    return $member_theme;
 }
 add_filter( 'stylesheet', 'groups_force_buddypress_stylesheet', 1, 1 );