Ticket #8004: 8004.diff

src/bp-templates/bp-legacy/buddypress/activity/entry.php

@@ -145 +145 @@
                                          */
                                         do_action( 'bp_activity_entry_comments' ); ?>
 
-                                        <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ); ?>
+                                        <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment_' . bp_get_activity_id() ); ?>
 
                                 </form>
 

src/bp-templates/bp-legacy/js/buddypress.js

@@ -610 +610 @@
                         ajaxdata = {
                                 action: 'new_activity_comment',
                                 'cookie': bp_get_cookies(),
-                                '_wpnonce_new_activity_comment': jq('#_wpnonce_new_activity_comment').val(),
+                                '_wpnonce_new_activity_comment': jq('#_wpnonce_new_activity_comment' + '_' + comment_id ).val(),
                                 'comment_id': comment_id,
                                 'form_id': form_id[2],
                                 'content': content.val()

src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php

@@ -23 +23 @@
                 <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
 
                 <?php
-                bp_nouveau_submit_button( 'activity-new-comment' );
+                bp_nouveau_submit_button( 'activity-new-comment', bp_get_activity_id() );
                 printf(
                         '&nbsp; <button type="button" class="ac-reply-cancel">%s</button>',
                         esc_html( _x( 'Cancel', 'button', 'buddypress' ) )

src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -2585 +2585 @@
  *
  * @param string $action The action to get the submit button for. Required.
  */
-function bp_nouveau_submit_button( $action ) {
+function bp_nouveau_submit_button( $action, $object_id = 0 ) {
         $submit_data = bp_nouveau_get_submit_button( $action );
         if ( empty( $submit_data['attributes'] ) || empty( $submit_data['nonce'] ) ) {
                 return;
@@ -2619 +2619 @@
         if ( empty( $submit_data['nonce_key'] ) ) {
                 wp_nonce_field( $submit_data['nonce'] );
         } else {
+                if ( $object_id ) {
+                        $submit_data['nonce_key'] .= '_' . (int) $object_id;
+                }
+
                 wp_nonce_field( $submit_data['nonce'], $submit_data['nonce_key'] );
         }
 

src/bp-templates/bp-nouveau/js/buddypress-activity.js

@@ -1 +1 @@
 /* jshint browser: true */
 /* global bp, BP_Nouveau */
-/* @version 3.1.0 */
+/* @since 3.0.0 */
+/* @version 7.0.0 */
 window.bp = window.bp || {};
 
 ( function( exports, $ ) {
@@ -735 +736 @@
 
                                 comment_data = {
                                         action                        : 'new_activity_comment',
-                                        _wpnonce_new_activity_comment : $( '#_wpnonce_new_activity_comment' ).val(),
+                                        _wpnonce_new_activity_comment : $( '#_wpnonce_new_activity_comment' + '_' + item_id ).val(),
                                         comment_id                    : item_id,
                                         form_id                       : activity_id,
                                         content                       : comment_content.val()