Ticket #7732: 7732.1.diff

src/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php

@@ -6 +6 @@
  */
 ?>
 <h2 class="bp-screen-title <?php if ( bp_is_group_create() ) { echo esc_attr( 'creation-step-name' ); } ?>">
-        <?php _e( 'Edit your groups name &amp; description', 'buddypress' ); ?>
+        <?php _e( 'Edit your group&rsquo;s name &amp; description', 'buddypress' ); ?>
 </h2>
 
 <label for="group-name"><?php _e( 'Group Name (required)', 'buddypress' ); ?></label>

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

@@ -217 +217 @@
                 $bp->groups->current_create_step = array_shift( $keys );
         }
 
-        $counter = 1;
-
-        foreach ( (array) $bp->groups->group_creation_steps as $slug => $step ) {
-                $is_enabled = bp_are_previous_group_creation_steps_complete( $slug ); ?>
+        $counter              = 1;
+        $last_accessible_step = '';
 
+        foreach ( $bp->groups->group_creation_steps as $slug => $step ) {
+                /*
+                 * Has the user worked through to the current step?
+                 * If not, use the last accessible step's slug and mark the link "disabled."
+                 */
+                if ( bp_are_previous_group_creation_steps_complete( $slug ) ) {
+                        $disabled_attr        = '';
+                        $last_accessible_step = $slug;
+                } else {
+                        $disabled_attr = ' disabled="disabled"';
+                }
+                ?>
                 <li<?php if ( bp_get_groups_current_create_step() === $slug ) : ?> class="current"<?php endif; ?>>
-                        <?php if ( $is_enabled ) : ?>
-                                <a href="<?php echo esc_url( bp_groups_directory_permalink() . 'create/step/' . $slug . '/' ); ?>">
-                                        <?php echo (int) $counter; ?> <?php echo esc_html( $step['name'] ); ?>
-                                </a>
-                        <?php else : ?>
-                                <a disabled="disabled"><?php echo (int) $counter; ?>. <?php echo esc_html( $step['name'] ); ?></a>
-                        <?php endif ?>
+                        <a href="<?php echo esc_url( bp_get_groups_directory_permalink() . 'create/step/' . $last_accessible_step . '/' ); ?>"<?php echo $disabled_attr; ?>>
+                                <?php echo (int) $counter; ?>. <?php echo esc_html( $step['name'] ); ?>
+                        </a>
                 </li>
-                        <?php
+                <?php
                 $counter++;
         }
 
-        unset( $is_enabled );
-
         /**
          * Fires at the end of the creation of the group tabs.
          *