Ticket #2976: 2976-2.patch

bp-groups/bp-groups-classes.php

@@ -1164 +1164 @@
                         if ( $bp->current_component == $bp->groups->slug && 'admin' == $bp->current_action && !empty( $bp->action_variables[0] ) && $this->slug == $bp->action_variables[0] ) {
                                 add_action( 'wp', array( &$this, 'edit_screen_save' ) );
                                 add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
-
-                                if ( '' != locate_template( array( 'groups/single/home.php' ), false ) ) {
-                                        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
-                                } else {
-                                        add_action( 'bp_template_content_header', create_function( '', 'echo "<ul class=\"content-header-nav\">"; bp_group_admin_tabs(); echo "</ul>";' ) );
-                                        add_action( 'bp_template_content', array( &$this, 'edit_screen' ) );
-                                        bp_core_load_template( apply_filters( 'bp_core_template_plugin', '/groups/single/plugins' ) );
-                                }
+                                
+                                // The template must be loaded very late so that other functions
+                                // hooked to 'wp' have a chance to run
+                                add_action( 'wp', array( &$this, '_load_edit_template' ), 999 );
                         }
                 }
 
@@ -1193 +1189 @@
                                 add_action( $this->display_hook, array( &$this, 'widget_display' ) );
                 }
         }
+        
+        /**
+         * Load the extension's admin template
+         *
+         * @since 1.3
+         */
+        function _load_edit_template() {        
+                if ( '' != locate_template( array( 'groups/single/home.php' ), false ) ) {
+                        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+                } else {
+                        add_action( 'bp_template_content_header', create_function( '', 'echo "<ul class=\"content-header-nav\">"; bp_group_admin_tabs(); echo "</ul>";' ) );
+                        add_action( 'bp_template_content', array( &$this, 'edit_screen' ) );
+                        bp_core_load_template( apply_filters( 'bp_core_template_plugin', '/groups/single/plugins' ) );
+                }
+        }
 
         function _display_hook() {
                 add_action( 'bp_template_content', array( &$this, 'display' ) );