Changeset 5414

Timestamp:

11/29/2011 09:41:36 PM (11 years ago)

Author:

boonebgorges

Message:

Ensures links are constructed with trailing slash in activity component. See #3779

Location:

trunk/bp-activity

Files:

• bp-activity-actions.php (modified) (1 diff)
• bp-activity-akismet.php (modified) (2 diffs)
• bp-activity-screens.php (modified) (1 diff)

trunk/bp-activity/bp-activity-actions.php

@@ -89 +89 @@
     // Set redirect to users' activity stream
     } else {
-        $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . bp_get_activity_slug() . '/' . $activity->id;
+        $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . bp_get_activity_slug() . '/' . $activity->id . '/';
     }
 

trunk/bp-activity/bp-activity-akismet.php

@@ -175 +175 @@
                 'id'         => 'activity_make_spam_' . bp_get_activity_id(),
                 'link_class' => 'bp-secondary-action spam-activity confirm button item-button',
-                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_id(), 'bp_activity_akismet_spam_' . bp_get_activity_id() ),
+                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_id() . '/', 'bp_activity_akismet_spam_' . bp_get_activity_id() ),
                 'link_text'  => __( 'Spam', 'buddypress' ),
                 'wrapper'    => false,
@@ -204 +204 @@
                 'id'         => 'activity_make_spam_' . bp_get_activity_comment_id(),
                 'link_class' => 'bp-secondary-action spam-activity-comment confirm',
-                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_comment_id() . '?cid=' . bp_get_activity_comment_id(), 'bp_activity_akismet_spam_' . bp_get_activity_comment_id() ),
+                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_comment_id() . '/?cid=' . bp_get_activity_comment_id(), 'bp_activity_akismet_spam_' . bp_get_activity_comment_id() ),
                 'link_text'  => __( 'Spam', 'buddypress' ),
                 'wrapper'    => false,

trunk/bp-activity/bp-activity-screens.php

@@ -248 +248 @@
         is_user_logged_in() ?
             bp_core_redirect( $bp->loggedin_user->domain ) :
-            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $bp->current_action ) ) );
+            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $bp->current_action . '/' ) ) );
     }