Ticket #7839: 7839.patch

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

@@ -20 +20 @@
                         </label>
                         <textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input bp-suggestions" name="ac_input_<?php bp_activity_id(); ?>"></textarea>
                 </div>
+                <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
+
                 <?php
+                bp_nouveau_submit_button( 'activity-new-comment' );
                 printf(
-                        '<input type="submit" name="ac_form_submit" value="%s" /> &nbsp; <button type="button" class="ac-reply-cancel">%s</button>',
-                        esc_attr( _x( 'Post', 'button', 'buddypress' ) ),
+                        '&nbsp; <button type="button" class="ac-reply-cancel">%s</button>',
                         esc_html( _x( 'Cancel', 'button', 'buddypress' ) )
                 );
                 ?>
-                <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
         </div>
 
-        <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ); ?>
-
 </form>

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

@@ -699 +699 @@
  */
 function bp_nouveau_activity_comment_form() {
         bp_get_template_part( 'activity/comment-form' );
-
-        /**
-         * Fires after the activity entry comment form.
-         *
-         * @since 1.5.0
-         */
-        do_action( 'bp_activity_entry_comments' );
 }
 
 /**

src/bp-templates/bp-nouveau/includes/functions.php

@@ -1333 +1333 @@
                                 'class' => 'auto',
                         ),
                 ),
+                'activity-new-comment' => array(
+                        'after'     => 'bp_activity_entry_comments',
+                        'nonce'     => 'new_activity_comment',
+                        'nonce_key' => '_wpnonce_new_activity_comment',
+                        'wrapper'   => false,
+                        'attributes' => array(
+                                'name'  => 'ac_form_submit',
+                                'value' => _x( 'Post', 'button', 'buddypress' ),
+                        ),
+                ),
         ) );
 
         if ( isset( $actions[ $action ] ) ) {

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

@@ -2423 +2423 @@
                 do_action( $submit_data['before'] );
         }
 
-        // Output the submit button.
-        printf(
-                '<div class="submit">
-                        <input type="submit" %s/>
-                </div>',
+        $submit_input = sprintf( '<input type="submit" %s/>',
                 bp_get_form_field_attributes( 'submit', $submit_data['attributes'] )  // Safe.
         );
 
-        wp_nonce_field( $submit_data['nonce'] );
+        // Output the submit button.
+        if ( isset( $submit_data['wrapper'] ) && false === $submit_data['wrapper'] ) {
+                echo $submit_input;
+
+        // Output the submit button into a wrapper.
+        } else {
+                printf( '<div class="submit">%s</div>', $submit_input );
+        }
+
+        if ( empty( $submit_data['nonce_key'] ) ) {
+                wp_nonce_field( $submit_data['nonce'] );
+        } else {
+                wp_nonce_field( $submit_data['nonce'], $submit_data['nonce_key'] );
+        }
 
         if ( ! empty( $submit_data['after'] ) ) {