Ticket #723: wire_slug_problem.patch

bp-wire.php

@@ -91 +91 @@
                 return false;
         
         if ( !$table_name )
-                $table_name = $bp->{$component_name}->table_name_wire;
+                $table_name = $bp->groups->table_name_wire;
 
         $wire_post = new BP_Wire_Post( $table_name );
         $wire_post->item_id = $item_id;
@@ -123 +123 @@
                 return false;
 
         if ( !$table_name )
-                $table_name = $bp->{$component_name}->table_name_wire;
+                $table_name = $bp->groups->table_name_wire;
         
         $wire_post = new BP_Wire_Post( $table_name, $wire_post_id );
         

bp-wire/bp-wire-templatetags.php

@@ -28 +28 @@
                                 bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'xprofile', 'new_wire_post' );
                         
                 } else {
-                        $this->table_name = $bp->{$component_slug}->table_name_wire;
+                        $this->table_name = $bp->groups->table_name_wire;
                 }
                 
                 $this->pag_page = isset( $_REQUEST['wpage'] ) ? intval( $_REQUEST['wpage'] ) : 1;
@@ -315 +315 @@
                 if ( $bp->current_component == $bp->wire->slug || $bp->current_component == $bp->profile->slug ) {
                         return apply_filters( 'bp_get_wire_get_action', $bp->displayed_user->domain . $bp->wire->slug . '/post/' );
                 } else {
-                        return apply_filters( 'bp_get_wire_get_action', site_url() . '/' . $bp->{$bp->current_component}->slug . '/' . $uri . '/' . $bp->wire->slug . '/post/' );
+                        return apply_filters( 'bp_get_wire_get_action', site_url() . '/' . $bp->groups->slug . '/' . $uri . '/' . $bp->wire->slug . '/post/' );
                 }
         }
 
@@ -365 +365 @@
                         if ( $bp->wire->slug == $bp->current_component || $bp->profile->slug == $bp->current_component ) {
                                 return apply_filters( 'bp_get_wire_delete_link', '<a href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
                         } else {
-                                return apply_filters( 'bp_get_wire_delete_link', '<a href="' . wp_nonce_url( site_url( $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
+                                return apply_filters( 'bp_get_wire_delete_link', '<a href="' . wp_nonce_url( site_url( $bp->groups->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
                         }
                 }
         }