Changeset 5417

Timestamp:

11/29/2011 11:06:58 PM (12 years ago)

Author:

boonebgorges

Message:

Ensures links are constructed with trailing slash in groups, members, and messages components. See #3779

Location:

trunk

Files:

• bp-groups/bp-groups-activity.php (modified) (4 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (2 diffs)
• bp-groups/bp-groups-screens.php (modified) (3 diffs)
• bp-groups/bp-groups-template.php (modified) (7 diffs)
• bp-members/bp-members-signup.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-messages/bp-messages-actions.php (modified) (6 diffs)
• bp-messages/bp-messages-functions.php (modified) (1 diff)
• bp-messages/bp-messages-screens.php (modified) (1 diff)
• bp-messages/bp-messages-template.php (modified) (2 diffs)

trunk/bp-groups/bp-groups-activity.php

@@ -130 +130 @@
                 $text = sprintf( __( '%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name );
                 $filter = 'bp_groups_multiple_membership_request_accepted_notification';
-                $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '/?n=1';
+                $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
 
                 if ( 'string' == $format ) {
@@ -166 +166 @@
                 $text = sprintf( __( '%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name );
                 $filter = 'bp_groups_multiple_membership_request_rejected_notification';
-                $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '/?n=1';
+                $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
 
                 if ( 'string' == $format ) {
@@ -202 +202 @@
                 $text = sprintf( __( 'You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items );
                 $filter = 'bp_groups_multiple_member_promoted_to_admin_notification';
-                $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '?n=1';
+                $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
 
                 if ( 'string' == $format ) {
@@ -238 +238 @@
                 $text = sprintf( __( 'You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items );
                 $filter = 'bp_groups_multiple_member_promoted_to_mod_notification';
-                $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '?n=1';
+                $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) . '?n=1';
 
                 if ( 'string' == $format ) {

trunk/bp-groups/bp-groups-classes.php

@@ -1280 +1280 @@
         // Construct the admin edit tab for the new group extension
         if ( !empty( $this->enable_edit_item ) && !empty( $bp->is_item_admin ) ) {
-            add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', '$selected = ""; if ( "' . esc_attr( $this->admin_slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/{$group_slug}/admin/' . esc_attr( $this->admin_slug ) . '\">' . esc_attr( $this->admin_name ) . '</a></li>";' ), 10, 2 );
+            add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', '$selected = ""; if ( "' . esc_attr( $this->admin_slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/{$group_slug}/admin/' . esc_attr( $this->admin_slug ) ) . '\">' . esc_attr( $this->admin_name ) . '</a></li>";' ), 10, 2 );
 
             // Catch the edit screen and forward it to the plugin template

trunk/bp-groups/bp-groups-notifications.php

@@ -19 +19 @@
         $to = $ud->user_email;
 
-        $group_link    = site_url( bp_get_groups_root_slug(). '/' . $group->slug );
+        $group_link    = bp_get_group_permalink( $group );
         $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
         $settings_link = bp_core_get_user_domain( $user_id ) . $settings_slug . '/notifications/';
@@ -223 +223 @@
         $settings_link = bp_core_get_user_domain( $invited_user_id ) . bp_get_settings_slug() . '/notifications/';
         $invited_link = bp_core_get_user_domain( $invited_user_id );
-        $invites_link = $invited_link . bp_get_groups_slug() . '/invites';
+        $invites_link = trailingslashit( $invited_link . bp_get_groups_slug() . '/invites' );
 
         // Set up and send the message

trunk/bp-groups/bp-groups-screens.php

@@ -61 +61 @@
         }
 
-        bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() );
+        bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() ) );
 
     } else if ( bp_is_action_variable( 'reject' ) && is_numeric( $group_id ) ) {
@@ -73 +73 @@
             bp_core_add_message( __('Group invite rejected', 'buddypress') );
 
-        bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() );
+        bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . bp_current_action() ) );
     }
 
@@ -791 +791 @@
                 do_action( 'groups_group_deleted', $bp->groups->current_group->id );
 
-                bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' );
-            }
-
-            bp_core_redirect( bp_loggedin_user_domain() . bp_get_groups_slug() );
+                bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) );
+            }
+
+            bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() ) );
         }
 

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

@@ -456 +456 @@
             $group =& $groups_template->group;
 
-        return apply_filters( 'bp_get_group_admin_permalink', bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin' );
+        return apply_filters( 'bp_get_group_admin_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin' ) );
     }
 
@@ -1268 +1268 @@
 ?>
     <?php if ( $bp->is_item_admin || $bp->is_item_mod ) { ?>
-        <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/edit-details"><?php _e( 'Details', 'buddypress' ); ?></a></li>
+        <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/edit-details' ) ?>"><?php _e( 'Details', 'buddypress' ); ?></a></li>
     <?php } ?>
 
@@ -1275 +1275 @@
             return false;
     ?>
-    <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-settings"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
+    <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
 
     <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
-        <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-avatar"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
+        <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
     <?php endif; ?>
 
-    <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/manage-members"><?php _e( 'Members', 'buddypress' ); ?></a></li>
+    <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/manage-members' ) ?>"><?php _e( 'Members', 'buddypress' ); ?></a></li>
 
     <?php if ( $groups_template->group->status == 'private' ) : ?>
-        <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/membership-requests"><?php _e( 'Requests', 'buddypress' ); ?></a></li>
+        <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/membership-requests' ) ?>"><?php _e( 'Requests', 'buddypress' ); ?></a></li>
     <?php endif; ?>
 
     <?php do_action( 'groups_admin_tabs', $current_tab, $group->slug ) ?>
 
-    <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/delete-group"><?php _e( 'Delete', 'buddypress' ); ?></a></li>
+    <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/delete-group' ) ?>"><?php _e( 'Delete', 'buddypress' ); ?></a></li>
 <?php
 }
@@ -1407 +1407 @@
             $group =& $groups_template->group;
 
-        return apply_filters( 'bp_get_group_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );
+        return apply_filters( 'bp_get_group_accept_invite_link', wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/accept/' . $group->id ), 'groups_accept_invite' ) );
     }
 
@@ -1419 +1419 @@
             $group =& $groups_template->group;
 
-        return apply_filters( 'bp_get_group_reject_invite_link', wp_nonce_url( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/reject/' . $group->id, 'groups_reject_invite' ) );
+        return apply_filters( 'bp_get_group_reject_invite_link', wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . bp_get_groups_slug() . '/invites/reject/' . $group->id ), 'groups_reject_invite' ) );
     }
 
@@ -2019 +2019 @@
             $bp->action_variables[1] = array_shift( array_keys( $bp->groups->group_creation_steps ) );
 
-        return apply_filters( 'bp_get_group_creation_form_action', 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_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_action_variable( 1 ) ) );
     }
 
@@ -2271 +2271 @@
     global $create_group_step, $completed_to_step;
 ?>
-    <li<?php if ( !bp_action_variable( 0 ) || bp_is_action_variable( 'recently-active', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-    <li<?php if ( bp_is_action_variable( 'recently-joined', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
-    <li<?php if ( bp_is_action_variable( 'most-popular', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/most-popular"><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
-    <li<?php if ( bp_is_action_variable( 'admin-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/admin-of"><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( bp_is_action_variable( 'mod-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/mod-of"><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( bp_is_action_variable( 'alphabetically' ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_groups_slug() ?>/my-groups/alphabetically"><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+    <li<?php if ( !bp_action_variable( 0 ) || bp_is_action_variable( 'recently-active', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/recently-active' ) ?>"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+    <li<?php if ( bp_is_action_variable( 'recently-joined', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/recently-joined' ) ?>"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
+    <li<?php if ( bp_is_action_variable( 'most-popular', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/most-popular' ) ?>"><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
+    <li<?php if ( bp_is_action_variable( 'admin-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/admin-of' ) ?>"><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
+    <li<?php if ( bp_is_action_variable( 'mod-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/mod-of' ) ?>"><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
+    <li<?php if ( bp_is_action_variable( 'alphabetically' ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/alphabetically' ) ?>"><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
 <?php
     do_action( 'groups_header_tabs' );

trunk/bp-members/bp-members-signup.php

@@ -24 +24 @@
     if ( is_user_logged_in() ) {
         if ( bp_is_component_front_page( 'register' ) )
-            $redirect_to = bp_get_root_domain() . '/' . bp_get_members_root_slug();
+            $redirect_to = trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
         else
             $redirect_to = bp_get_root_domain();

trunk/bp-members/bp-members-template.php

@@ -759 +759 @@
             $link = str_replace( $bp->loggedin_user->domain, $bp->displayed_user->domain, $user_nav_item['link'] );
         else
-            $link = $bp->displayed_user->domain . $user_nav_item['link'];
+            $link = trailingslashit( $bp->displayed_user->domain . $user_nav_item['link'] );
 
         echo apply_filters_ref_array( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], array( '<li id="' . $user_nav_item['css_id'] . '-personal-li" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item ) );

trunk/bp-messages/bp-messages-actions.php

@@ -18 +18 @@
 
     if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access( $thread_id ) && !bp_current_user_can( 'bp_moderate' ) ) )
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() );
+        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ) );
 
     // Check if a new reply has been submitted
@@ -53 +53 @@
         'position'        => 40,
         'user_has_access' => bp_is_my_profile(),
-        'link'            => bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . (int) $thread_id
+        'link'            => trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . (int) $thread_id )
     ) );
 
@@ -69 +69 @@
 
     if ( !$thread_id || !is_numeric( $thread_id ) || !messages_check_thread_access( $thread_id ) ) {
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
+        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
     } else {
         if ( !check_admin_referer( 'messages_delete_thread' ) )
@@ -80 +80 @@
             bp_core_add_message( __('Message deleted.', 'buddypress') );
         }
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
+        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
     }
 }
@@ -94 +94 @@
 
     if ( !$thread_ids || !messages_check_thread_access( $thread_ids ) ) {
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
+        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
     } else {
         if ( !check_admin_referer( 'messages_delete_thread' ) )
@@ -104 +104 @@
             bp_core_add_message( __('Messages deleted.', 'buddypress') );
 
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );
+        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() ) );
     }
 }

trunk/bp-messages/bp-messages-functions.php

@@ -234 +234 @@
 
     if ( 'new_message' == $action ) {
-        $link  = bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox';
+        $link  = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox' );
         $title = __( 'Inbox', 'buddypress' );
 

trunk/bp-messages/bp-messages-screens.php

@@ -115 +115 @@
             }
         }
-        bp_core_redirect( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices' );
+        bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices' ) );
     }
 

trunk/bp-messages/bp-messages-template.php

@@ -255 +255 @@
     function bp_get_message_thread_delete_link() {
         global $messages_template, $bp;
-        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id, 'messages_delete_thread' ) );
+        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id ), 'messages_delete_thread' ) );
     }
 
@@ -480 +480 @@
 
         if ( 1 == (int)$messages_template->thread->is_active ) {
-            $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id, 'messages_deactivate_notice' );
+            $link = wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id ), 'messages_deactivate_notice' );
         } else {
-            $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id, 'messages_activate_notice' );
+            $link = wp_nonce_url( trailingslashit( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id ), 'messages_activate_notice' );
         }
         return apply_filters( 'bp_get_message_activate_deactivate_link', $link );