Changeset 514

Timestamp:

11/07/2008 06:51:17 PM (18 years ago)

Author:

apeatling

Message:

Fixing bug with wire messages deletion

Location:

trunk

Files:

• bp-groups.php (modified) (1 diff)
• bp-wire.php (modified) (1 diff)

trunk/bp-groups.php

@@ -358 +358 @@
 
                         if ( !groups_new_wire_post( $group_obj->id, $_POST['wire-post-textarea'] ) ) {
-                                bp_catch_uri( 'groups/group-home' );
+                                bp_core_add_message( __('Wire message could not be posted.', 'buddypress'), 'error' );
                         } else {
                                 bp_core_add_message( __('Wire message successfully posted.', 'buddypress') );
-                                
-                                if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-                                        wp_redirect( bp_group_permalink( $group_obj, false ) );
-                                } else {
-                                        wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
-                                }
                         }
+                        
+                        if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
+                                wp_redirect( bp_group_permalink( $group_obj, false ) );
+                        } else {
+                                wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
+                        }
         
                 } else if ( $wire_action == 'delete' && BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) {
-                        $wire_message_id = $bp['action_variables'][2];
-                                                                
+                        $wire_message_id = $bp['action_variables'][1];
+
                         if ( !groups_delete_wire_post( $wire_message_id, $bp['groups']['table_name_wire'] ) ) {
-                                bp_catch_uri( 'groups/group-home' );
+                                bp_core_add_message( __('There was an error deleting the wire message.', 'buddypress'), 'error' );
                         } else {
                                 bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
-                                
-                                if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-                                        wp_redirect( bp_group_permalink( $group_obj, false ) );
-                                } else {
-                                        wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
-                                }
+                        }
+                        
+                        if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
+                                wp_redirect( bp_group_permalink( $group_obj, false ) );
+                        } else {
+                                wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
                         }
                 

trunk/bp-wire.php

@@ -110 +110 @@
         
         if ( bp_wire_delete_post( $bp['action_variables'][0], $bp['profile']['table_name_wire'] ) ) {
-                bp_core_add_message( __('Wire message successfully deleted.', 'buddypress'), false, true );
+                bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
                 do_action( 'bp_xprofile_delete_wire_post' );                                            
+        } else {
+                bp_core_add_message( __('Wire post could not be deleted, please try again.', 'buddypress'), 'error' );
+                do_action( 'bp_xprofile_delete_wire_post' );            
         }