Ticket #7781: 7781.2.patch

deleted file src/bp-templates/bp-nouveau/buddypress/groups/create-invites.php

@@ -1 @@
-<?php
-/**
-* Group create step invite friends
-*
-* This template include provides the standard BP invites step screen content
-*
-* @since 3.0.0
-*/
-?>
-
-<?php bp_nouveau_user_feedback( 'create-invite-friends' ); ?>
-
-<?php
-bp_new_group_invite_friend_list( array(  'before' => '<ul class="friends-list create-group-invites">', 'after' => '</ul>' ) );

src/bp-templates/bp-nouveau/buddypress/groups/create.php

@@ -9 +9 @@
 
         <?php bp_nouveau_groups_create_hook( 'before', 'content_template' ); ?>
 
-        <form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
+        <?php if ( 'group-invites' !== bp_get_groups_current_create_step() ) : ?>
+                <form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
+        <?php else : ?>
+                <div id="create-group-form" class="standard-form">
+        <?php endif; ?>
 
                 <?php bp_nouveau_groups_create_hook( 'before' ); ?>
 
@@ -31 +35 @@
 
                 <?php bp_nouveau_groups_create_hook( 'after' ); ?>
 
-        </form>
+        <?php if ( 'group-invites' !== bp_get_groups_current_create_step() ) : ?>
+                </form><!-- #create-group-form -->
+        <?php else : ?>
+                </div><!-- #create-group-form -->
+        <?php endif; ?>
 
         <?php bp_nouveau_groups_create_hook( 'after', 'content_template' ); ?>
 

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

@@ -1066 +1066 @@
 function bp_nouveau_group_get_core_create_screens( $id = '' ) {
         // screen id => dynamic part of the hooks, nonce & specific template to use.
         $screens = array(
-                'group-details'     => array( 'hook' => 'group_details_creation_step',     'nonce' => 'groups_create_save_group-details',     'template' => 'groups/single/admin/edit-details' ),
-                'group-settings'    => array( 'hook' => 'group_settings_creation_step',    'nonce' => 'groups_create_save_group-settings',                                                     ),
-                'group-avatar'      => array( 'hook' => 'group_avatar_creation_step',      'nonce' => 'groups_create_save_group-avatar',                                                       ),
-                'group-cover-image' => array( 'hook' => 'group_cover_image_creation_step', 'nonce' => 'groups_create_save_group-cover-image',                                                  ),
-                'group-invites'     => array( 'hook' => 'group_invites_creation_step',     'nonce' => 'groups_create_save_group-invites',     'template' => 'groups/create-invites'      ),
+                'group-details' => array(
+                        'hook'     => 'group_details_creation_step',
+                        'nonce'    => 'groups_create_save_group-details',
+                        'template' => 'groups/single/admin/edit-details',
+                ),
+                'group-settings' => array(
+                        'hook'  => 'group_settings_creation_step',
+                        'nonce' => 'groups_create_save_group-settings',
+                ),
+                'group-avatar' => array(
+                        'hook'  => 'group_avatar_creation_step',
+                        'nonce' => 'groups_create_save_group-avatar',
+                ),
+                'group-cover-image' => array(
+                        'hook'  => 'group_cover_image_creation_step',
+                        'nonce' => 'groups_create_save_group-cover-image',
+                ),
+                'group-invites' => array(
+                        'hook'     => 'group_invites_creation_step',
+                        'nonce'    => 'groups_create_save_group-invites',
+                        'template' => 'common/js-templates/invites/index',
+                ),
         );
 
         if ( isset( $screens[ $id ] ) ) {

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

@@ -356 +356 @@
                                         );
                                 }
                         }
-
-                        wp_nonce_field( $core_screen['nonce'] );
                 }
         }
 
@@ -413 +411 @@
                 do_action( 'bp_after_group_creation_step_buttons' );
         }
 
+        /**
+         * Avoid nested forms with the Backbone views for the group invites step.
+         */
+        if ( 'group-invites' === bp_get_groups_current_create_step() ) {
+                printf(
+                        '<form action="%s" method="post" enctype="multipart/form-data">',
+                        bp_get_group_creation_form_action()
+                );
+        }
+
+        if ( ! empty( $core_screen['nonce'] ) ) {
+                wp_nonce_field( $core_screen['nonce'] );
+        }
+
         printf(
                 '<input type="hidden" name="group-id" id="group-id" value="%s" />',
                 $is_group_create ? esc_attr( bp_get_new_group_id() ) : esc_attr( bp_get_group_id() )
@@ -437 +449 @@
                  */
                 do_action( 'bp_directory_groups_content' );
         }
+
+        /**
+         * Avoid nested forms with the Backbone views for the group invites step.
+         */
+        if ( 'group-invites' === bp_get_groups_current_create_step() ) {
+                echo '</form>';
+        }
 }
 
 /**

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

@@ -1593 +1593 @@
                         $classes[] = 'group-subnav';
                 }
 
-                if ( bp_is_group() && 'send-invites' === bp_current_action() ) {
+                if ( ( bp_is_group() && 'send-invites' === bp_current_action() ) || ( bp_is_group_create() && 'group-invites' === bp_get_groups_current_create_step() ) ) {
                         $classes[] = 'bp-invites-nav';
                 }