Changeset 3980

Timestamp:

02/01/2011 02:56:33 AM (14 years ago)

Author:

boonebgorges

Message:

Ensures that group extensions load themselves under the groups root_slug

Location:

trunk

Files:

• bp-core/bp-core-hooks.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (3 diffs)

trunk/bp-core/bp-core-hooks.php

@@ -29 +29 @@
 
 // Setup widgets
-add_action( 'bp_loaded',    'bp_setup_widgets'         );
+add_action( 'bp_loaded',  'bp_setup_widgets'           );
     
 // Setup admin bar

trunk/bp-groups/bp-groups-classes.php

@@ -1169 +1169 @@
         if ( $this->visibility == 'public' || ( $this->visibility != 'public' && $bp->groups->current_group->user_has_access ) ) {
             if ( $this->enable_nav_item ) {
-                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item )
-                    bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
+                if ( bp_is_current_component( 'groups' ) && $bp->is_single_item ) {
+                    bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => $bp->groups->root_slug, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
+                }
 
                 // When we are viewing the extension display page, set the title and options title
-                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && $bp->current_action == $this->slug ) {
+                if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && $bp->current_action == $this->slug ) {
                     add_action( 'bp_template_content_header', create_function( '', 'echo "' . esc_attr( $this->name ) . '";' ) );
                     add_action( 'bp_template_title', create_function( '', 'echo "' . esc_attr( $this->name ) . '";' ) );
@@ -1180 +1181 @@
 
             // Hook the group home widget
-            if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
+            if ( bp_is_current_component( 'groups' ) && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
                 add_action( $this->display_hook, array( &$this, 'widget_display' ) );
         }
@@ -1198 +1199 @@
 
     /* Register the group extension on the bp_init action so we have access to all plugins */
-    add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "wp", array( &$extension, "_register" ), 2 );' ), 11 );
+    add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "bp_init", array( &$extension, "_register" ), 1 );' ), 11 );
 }