Ticket #7919: 7919.02.patch

src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php

@@ -71 +71 @@
                 <?php foreach ( $group_types as $type ) : ?>
                         <div class="checkbox">
                                 <label for="<?php printf( 'group-type-%s', $type->name ); ?>">
-                                        <input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', $type->name ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php checked( bp_groups_has_group_type( bp_get_current_group_id(), $type->name ) ); ?>/> <?php echo esc_html( $type->labels['name'] ); ?>
+                                        <input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', $type->name ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php bp_nouveau_group_type_checked( $type ); ?>/> <?php echo esc_html( $type->labels['name'] ); ?>
                                         <?php
                                         if ( ! empty( $type->description ) ) {
                                                 printf( '&ndash; %s', '<span class="bp-group-type-desc">' . esc_html( $type->description ) . '</span>' );

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

@@ -1360 +1360 @@
          */
         return apply_filters( 'bp_nouveau_get_group_description_excerpt', bp_create_excerpt( $group->description, $length ), $group );
 }
+
+/**
+ * Output "checked" attribute to determine if the group type should be checked.
+ *
+ * @since 3.2.0
+ *
+ * @param object $type Group type object. See bp_groups_get_group_type_object().
+ */
+function bp_nouveau_group_type_checked( $type = null ) {
+        if ( ! is_object( $type ) ) {
+                return;
+        }
+
+        // Group creation screen requires a different check.
+        if ( bp_is_group_create() ) {
+                checked( true, ! empty( $type->create_screen_checked ) );
+        } elseif ( bp_is_group() ) {
+                checked( bp_groups_has_group_type( bp_get_current_group_id(), $type->name ) );
+        }
+}