Changeset 9466 for trunk/src/bp-groups/bp-groups-actions.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-actions.php (modified) (10 diffs)

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 ) );
     }
 }