Changeset 1700

Timestamp:

08/26/2009 01:04:32 AM (16 years ago)

Author:

apeatling

Message:

Fixes #837 props DJPaul

Location:

trunk

Files:

• bp-groups.php (modified) (5 diffs)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)

trunk/bp-groups.php

@@ -745 +745 @@
                 return false;
         
-            if ( !groups_new_wire_post( $bp->groups->current_group->id, $_POST['wire-post-textarea'] ) ) {
+            if ( !groups_new_wire_post( $bp->groups->current_group->id, $_POST['wire-post-textarea'] ) )
                 bp_core_add_message( __('Wire message could not be posted.', 'buddypress'), 'error' );
-            } else {
+            else
                 bp_core_add_message( __('Wire message successfully posted.', 'buddypress') );
-            }
-
-            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
+
+            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) )
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
-            } else {
+            else
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
-            }
     
         } else if ( 'delete' == $wire_action && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
@@ -764 +762 @@
                 return false;
         
-            if ( !groups_delete_wire_post( $wire_message_id, $bp->groups->table_name_wire ) ) {
+            if ( !groups_delete_wire_post( $wire_message_id, $bp->groups->table_name_wire ) )
                 bp_core_add_message( __('There was an error deleting the wire message.', 'buddypress'), 'error' );
-            } else {
+            else
                 bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
-            }
-            
-            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
+            
+            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) )
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
-            } else {
+            else
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
-            }
         
         } else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) {
@@ -1349 +1345 @@
     if ( !function_exists( 'bp_activity_add' ) )
         return false;
-        
+    
+    /* If the group is not public, no recording of activity please. */
     if ( 'public' != $bp->groups->current_group->status )   
         return false;
@@ -1928 +1925 @@
     
     if ( $wire_post = bp_wire_new_post( $group_id, $content, 'groups' ) ) {
+        
+        /* Post an email notification if settings allow */
+        require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
+        groups_notification_new_wire_post( $group_id, $wire_post->id );
+        
+        /* Record this in activity streams */
         $activity_content = sprintf( __( '%s wrote on the wire of the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $content ) ) . '</blockquote>';
@@ -1939 +1942 @@
         ) );
 
-        do_action( 'groups_new_wire_post', $group_id, $wire_post_id );
+        do_action( 'groups_new_wire_post', $group_id, $wire_post->id );
         
         return true;

trunk/bp-groups/bp-groups-notifications.php

@@ -50 +50 @@
     }
 }
-add_action( 'groups_new_wire_post', 'groups_notification_new_wire_post', 10, 2 );
 
 function groups_notification_group_updated( $group_id ) {