Changeset 5941 for trunk/bp-groups/bp-groups-template.php

Timestamp:

03/23/2012 06:01:28 PM (13 years ago)

Author:

boonebgorges

Message:

Introduces template function bp_get_groups_current_create_step() to avoid direct calls to the bp global.
Replaces calls to bp->groups->current_create_step with bp_get_groups_current_create_step() throughout BP.
Adds current create step to body classes during group creation process. See #4095

File:

• trunk/bp-groups/bp-groups-template.php (modified) (6 diffs)

trunk/bp-groups/bp-groups-template.php

@@ -1994 +1994 @@
         return false;
 
-    if ( !$bp->groups->current_create_step )
+    if ( !bp_get_groups_current_create_step() )
         $bp->groups->current_create_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
 
@@ -2002 +2002 @@
         $is_enabled = bp_are_previous_group_creation_steps_complete( $slug ); ?>
 
-        <li<?php if ( $bp->groups->current_create_step == $slug ) : ?> class="current"<?php endif; ?>><?php if ( $is_enabled ) : ?><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() ?>/create/step/<?php echo $slug ?>/"><?php else: ?><span><?php endif; ?><?php echo $counter ?>. <?php echo $step['name'] ?><?php if ( $is_enabled ) : ?></a><?php else: ?></span><?php endif ?></li><?php
+        <li<?php if ( bp_get_groups_current_create_step() == $slug ) : ?> class="current"<?php endif; ?>><?php if ( $is_enabled ) : ?><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() ?>/create/step/<?php echo $slug ?>/"><?php else: ?><span><?php endif; ?><?php echo $counter ?>. <?php echo $step['name'] ?><?php if ( $is_enabled ) : ?></a><?php else: ?></span><?php endif ?></li><?php
         $counter++;
     }
@@ -2014 +2014 @@
     global $bp;
 
-    echo apply_filters( 'bp_group_creation_stage_title', '<span>&mdash; ' . $bp->groups->group_creation_steps[$bp->groups->current_create_step]['name'] . '</span>' );
+    echo apply_filters( 'bp_group_creation_stage_title', '<span>&mdash; ' . $bp->groups->group_creation_steps[bp_get_groups_current_create_step()]['name'] . '</span>' );
 }
 
@@ -2192 +2192 @@
     }
 
+/**
+ * Echoes the current group creation step
+ *
+ * @since 1.6
+ */
+function bp_groups_current_create_step() {
+    echo bp_get_groups_current_create_step();
+}
+    /**
+     * Returns the current group creation step. If none is found, returns an empty string
+     *
+     * @since 1.6
+     *
+     * @uses apply_filters() Filter bp_get_groups_current_create_step to modify
+     * @return str $current_create_step
+     */
+    function bp_get_groups_current_create_step() {
+        global $bp;
+        
+        if ( !empty( $bp->groups->current_create_step ) ) {
+            $current_create_step = $bp->groups->current_create_step;
+        } else {
+            $current_create_step = '';
+        }
+        
+        return apply_filters( 'bp_get_groups_current_create_step', $current_create_step );
+    }
+
 function bp_is_last_group_creation_step() {
     global $bp;
@@ -2197 +2225 @@
     $last_step = array_pop( array_keys( $bp->groups->group_creation_steps ) );
 
-    if ( $last_step == $bp->groups->current_create_step )
+    if ( $last_step == bp_get_groups_current_create_step() )
         return true;
 
@@ -2208 +2236 @@
     $first_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
 
-    if ( $first_step == $bp->groups->current_create_step )
+    if ( $first_step == bp_get_groups_current_create_step() )
         return true;