Ticket #4510: 4510.patch

bp-activity/bp-activity-actions.php

@@ -325 +325 @@
         }
 
         $comment_id = bp_activity_new_comment( array(
-                'content' => $content,
+                'content'     => $content,
                 'activity_id' => $activity_id,
-                'parent_id' => $parent_id
+                'parent_id'   => false
         ));
 
         if ( !empty( $comment_id ) )

bp-activity/bp-activity-notifications.php

@@ -188 +188 @@
          * If this is a reply to another comment, send an email notification to the
          * author of the immediate parent comment.
          */
-        if ( $activity_id == $parent_id )
+        if ( empty( $parent_id ) || ( $activity_id == $parent_id ) )
                 return false;
 
         $parent_comment = new BP_Activity_Activity( $parent_id );

bp-themes/bp-default/_inc/global.js

@@ -411 +411 @@
                         }
 
                         /* Hide any error messages */
-                        jq( 'form#' + form + ' div.error').hide();
+                        jq( 'form#' + form.attr('id') + ' div.error').hide();
                         target.addClass('loading').prop('disabled', true);
 
                         var ajaxdata = {
@@ -452 +452 @@
                                                                 form.parent().parent().addClass('has-comments');
                                                         }
                                                         );
-                                                jq( 'form#' + form + ' textarea').val('');
+                                                jq( 'form#' + form.attr('id') + ' textarea').val('');
 
                                                 /* Increase the "Reply (X)" button count */
                                                 jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );