Changeset 9466 for trunk/src/bp-groups/bp-groups-template.php

Timestamp:

02/09/2015 11:34:12 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all references to bp_get_root_domain() . '/' . bp_get_groups_root_slug() with the appropriate bp_get_groups_directory_permalink() function. This ensures all usages and filters are applied uniformly. See #4954 for the long-game here.

File:

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

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

@@ -925 +925 @@
         global $groups_template;
 
-        if ( empty( $group ) )
+        if ( empty( $group ) ) {
             $group =& $groups_template->group;
-
-        return apply_filters( 'bp_get_group_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/' ) );
+        }
+
+        return apply_filters( 'bp_get_group_permalink', trailingslashit( bp_get_groups_directory_permalink() . $group->slug . '/' ) );
     }
 
@@ -2891 +2892 @@
             'link_title' => __( 'Create a Group', 'buddypress' ),
             'link_class' => 'group-create no-ajax',
-            'link_href'  => trailingslashit( bp_get_root_domain() ) . trailingslashit( bp_get_groups_root_slug() ) . trailingslashit( 'create' ),
+            'link_href'  => trailingslashit( bp_get_groups_directory_permalink() . 'create' ),
             'wrapper'    => false,
             'block_self' => false,
@@ -3637 +3638 @@
         $is_enabled = bp_are_previous_group_creation_steps_complete( $slug ); ?>
 
-        <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
+        <li<?php if ( bp_get_groups_current_create_step() == $slug ) : ?> class="current"<?php endif; ?>><?php if ( $is_enabled ) : ?><a href="<?php bp_groups_directory_permalink(); ?>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++;
     }
@@ -3663 +3664 @@
         }
 
-        return apply_filters( 'bp_get_group_creation_form_action', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_action_variable( 1 ) ) );
+        return apply_filters( 'bp_get_group_creation_form_action', trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_action_variable( 1 ) ) );
     }
 
@@ -3828 +3829 @@
         }
 
-        return apply_filters( 'bp_get_group_creation_previous_link', trailingslashit( bp_get_root_domain() ) . bp_get_groups_root_slug() . '/create/step/' . array_pop( $previous_steps ) );
+        return apply_filters( 'bp_get_group_creation_previous_link', trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . array_pop( $previous_steps ) ) );
     }
 
@@ -4648 +4649 @@
 
         if ( bp_is_current_action( 'create' ) ) {
-            $uninvite_url = bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-invites/?user_id=' . $user_id;
+            $uninvite_url = bp_get_groups_directory_permalink() . 'create/step/group-invites/?user_id=' . $user_id;
         } else {
             $uninvite_url = bp_get_group_permalink( groups_get_current_group() ) . 'send-invites/remove/' . $user_id;