Ticket #723: wire_patch_three.patch

bp-groups.php

@@ -268 +268 @@
                                 bp_core_add_subnav_item( $bp->groups->slug, 'forum', __('Forum', 'buddypress'), $group_link , 'groups_screen_group_forum', 'group-forum', $is_visible);
 
                         if ( $has_access && $group_obj->enable_wire && function_exists('bp_wire_install') )
-                                bp_core_add_subnav_item( $bp->groups->slug, 'wire', __('Wire', 'buddypress'), $group_link, 'groups_screen_group_wire', 'group-wire', $is_visible );
+                                bp_core_add_subnav_item( $bp->groups->slug, $bp->wire->slug, __('Wire', 'buddypress'), $group_link, 'groups_screen_group_wire', 'group-wire', $is_visible );
 
                         if ( $has_access && $group_obj->enable_photos && function_exists('bp_gallery_install') )
                                 bp_core_add_subnav_item( $bp->groups->slug, 'photos', __('Photos', 'buddypress'), $group_link, 'groups_screen_group_photos', 'group-photos', $is_visible );

bp-groups/bp-groups-widgets.php

@@ -40 +40 @@
         <?php if ( $groups['groups'] ) : ?>
                 <div class="item-options" id="groups-list-options">
                         <img id="ajax-loader-groups" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( 'Loading', 'buddypress' ) ?>" style="display: none;" /> 
-                        <a href="<?php echo site_url() . '/groups' ?>" id="newest-groups"><?php _e("Newest", 'buddypress') ?></a> | 
-                        <a href="<?php echo site_url() . '/groups' ?>" id="recently-active-groups"><?php _e("Active", 'buddypress') ?></a> | 
-                        <a href="<?php echo site_url() . '/groups' ?>" id="popular-groups" class="selected"><?php _e("Popular", 'buddypress') ?></a>
+                        <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="newest-groups"><?php _e("Newest", 'buddypress') ?></a> |
+                        <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="recently-active-groups"><?php _e("Active", 'buddypress') ?></a> |
+                        <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="popular-groups" class="selected"><?php _e("Popular", 'buddypress') ?></a>
                 </div>
                 <ul id="groups-list" class="item-list">
                         <?php foreach ( $groups['groups'] as $group_id ) : ?>

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

@@ -20 +20 @@
         function bp_wire_posts_template( $item_id, $component_slug, $can_post, $per_page, $max ) {
                 global $bp;
                 
-                if ( $bp->current_component == $bp->wire->slug ) {
+                if ( $bp->current_component == $bp->wire->slug || 'profile' == $bp->current_component ) {
                         $this->table_name = $bp->profile->table_name_wire;
                         
                         // If the user is viewing their own wire, delete the notifications.
@@ -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 . '/' . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );
                         }
                 }
         }