Changeset 9466

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.

Location:

trunk/src

Files:

• bp-core/deprecated/2.1.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (3 diffs)
• bp-groups/bp-groups-actions.php (modified) (10 diffs)
• bp-groups/bp-groups-admin.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (6 diffs)
• bp-groups/bp-groups-widgets.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/forums/index.php (modified) (1 diff)

trunk/src/bp-core/deprecated/2.1.php ¶

@@ -344 +344 @@
             <?php if ( bp_is_active( 'groups' ) ) : ?>
 
-                <li class="alt"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) . '?random-group' ?>"  rel="nofollow"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
+                <li class="alt"><a href="<?php bp_groups_directory_permalink(); ?>?random-group"  rel="nofollow"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
 
             <?php endif; ?>

trunk/src/bp-forums/bp-forums-template.php ¶

@@ -1009 +1009 @@
 
         // Currently this will only work with group forums, extended support in the future
-        if ( bp_is_active( 'groups' ) )
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_get_the_topic_object_slug() . '/forum' );
-        else
+        if ( bp_is_active( 'groups' ) ) {
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . bp_get_the_topic_object_slug() . '/forum' );
+        } else {
             $permalink = '';
+        }
 
         /**
@@ -1426 +1427 @@
      */
     function bp_get_the_topic_permalink() {
-        global $forum_template, $bp;
+        global $forum_template;
 
         // The topic is in a loop where its parent object is loaded
         if ( bp_get_the_topic_object_slug() ) {
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_get_the_topic_object_slug() . '/forum' );
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . bp_get_the_topic_object_slug() . '/forum' );
 
         // We are viewing a single group topic, so use the current item
         } elseif ( bp_is_group_forum_topic() ) {
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_current_item() . '/forum' );
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . bp_current_item() . '/forum' );
 
         // We are unsure what the context is, so fallback to forum root slug
@@ -2712 +2713 @@
      */
     function bp_get_forum_permalink( $forum_id = 0 ) {
-        global $bp;
 
         if ( bp_is_groups_component() ) {
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_current_item() . '/forum' );
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . bp_current_item() . '/forum' );
         } else {
             if ( empty( $forum_id ) ) {

trunk/src/bp-groups/bp-groups-actions.php ¶

@@ -107 +107 @@
     if ( !bp_user_can_create_groups() ) {
         bp_core_add_message( __( 'Sorry, you are not allowed to create groups.', 'buddypress' ), 'error' );
-        bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) );
+        bp_core_redirect( bp_get_groups_directory_permalink() );
     }
 
@@ -124 +124 @@
         $reset_steps = true;
         $keys        = array_keys( $bp->groups->group_creation_steps );
-        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . array_shift( $keys ) . '/' );
+        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . array_shift( $keys ) ) );
     }
 
@@ -130 +130 @@
     if ( bp_get_groups_current_create_step() && empty( $bp->groups->group_creation_steps[bp_get_groups_current_create_step()] ) ) {
         bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
-        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/' );
+        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create' ) );
     }
 
@@ -145 +145 @@
         if ( ! bp_is_group_creator( $bp->groups->current_group, bp_loggedin_user_id() ) ) {
             bp_core_add_message( __( 'Only the group creator may continue editing this group.', 'buddypress' ), 'error' );
-            bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/' );
+            bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create' ) );
         }
     }
@@ -158 +158 @@
             if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) || !strlen( trim( $_POST['group-name'] ) ) || !strlen( trim( $_POST['group-desc'] ) ) ) {
                 bp_core_add_message( __( 'Please fill in all of the required fields', 'buddypress' ), 'error' );
-                bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_get_groups_current_create_step() . '/' );
+                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
             }
 
@@ -165 +165 @@
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
-                bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_get_groups_current_create_step() . '/' );
+                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
             }
         }
@@ -189 +189 @@
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_forum' => $group_enable_forum ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
-                bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_get_groups_current_create_step() . '/' );
+                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
             }
 
@@ -295 +295 @@
             }
 
-            bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . $next_step . '/' );
+            bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . $next_step ) );
         }
     }
@@ -314 +314 @@
 
         bp_core_add_message( $message, $error );
-        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-invites/' );
+        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/group-invites' ) );
     }
 
@@ -488 +488 @@
         $group = BP_Groups_Group::get_random( 1, 1 );
 
-        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group['groups'][0]->slug . '/' );
+        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . $group['groups'][0]->slug ) );
     }
 }

trunk/src/bp-groups/bp-groups-admin.php ¶

@@ -524 +524 @@
 
             <?php if ( is_user_logged_in() && bp_user_can_create_groups() ) : ?>
-                <a class="add-new-h2" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create' ); ?>"><?php _e( 'Add New', 'buddypress' ); ?></a>
+                <a class="add-new-h2" href="<?php echo trailingslashit( bp_get_groups_directory_permalink() . 'create' ); ?>"><?php _e( 'Add New', 'buddypress' ); ?></a>
             <?php endif; ?>
 
@@ -671 +671 @@
 
             <?php if ( is_user_logged_in() && bp_user_can_create_groups() ) : ?>
-                <a class="add-new-h2" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create' ); ?>"><?php _e( 'Add New', 'buddypress' ); ?></a>
+                <a class="add-new-h2" href="<?php echo trailingslashit( bp_get_groups_directory_permalink() . 'create' ); ?>"><?php _e( 'Add New', 'buddypress' ); ?></a>
             <?php endif; ?>
 

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;

trunk/src/bp-groups/bp-groups-widgets.php ¶

@@ -72 +72 @@
         echo $before_widget;
 
-        $title = !empty( $instance['link_title'] ) ? '<a href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) . '">' . $title . '</a>' : $title;
+        $title = !empty( $instance['link_title'] ) ? '<a href="' . bp_get_groups_directory_permalink() . '">' . $title . '</a>' : $title;
 
         echo $before_title . $title . $after_title;

trunk/src/bp-templates/bp-legacy/buddypress-functions.php ¶

@@ -1152 +1152 @@
         $user = new BP_Core_User( $friend_id );
 
-        $uninvite_url = bp_is_current_action( 'create' ) ? bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-invites/?user_id=' . $friend_id : bp_get_group_permalink( $group ) . 'send-invites/remove/' . $friend_id;
+        $uninvite_url = bp_is_current_action( 'create' )
+            ? bp_get_groups_directory_permalink() . 'create/step/group-invites/?user_id=' . $friend_id
+            : bp_get_group_permalink( $group )    . 'send-invites/remove/' . $friend_id;
 
         echo '<li id="uid-' . esc_attr( $user->id ) . '">';

trunk/src/bp-templates/bp-legacy/buddypress/forums/index.php ¶

@@ -125 +125 @@
                 <div id="message" class="info">
 
-                    <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( bp_get_groups_root_slug() . '/create/' ) ); ?></p>
+                    <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), trailingslashit( bp_get_groups_directory_permalink() . 'create' ) ); ?></p>
 
                 </div>