Changeset 4646

Timestamp:

07/12/2011 01:52:18 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Audit the usage of $bp->activity->slug. See #3325.

Location:

trunk

Files:

• bp-activity/bp-activity-actions.php (modified) (8 diffs)
• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-activity/bp-activity-screens.php (modified) (1 diff)
• bp-activity/bp-activity-template.php (modified) (4 diffs)
• bp-activity/feeds/bp-activity-friends-feed.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-group-feed.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-personal-feed.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-sitewide-feed.php (modified) (1 diff)
• bp-groups/bp-groups-screens.php (modified) (1 diff)
• bp-groups/bp-groups-template.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

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

@@ -17 +17 @@
 
     // Not viewing activity
-    if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'p' ) )
+    if ( ( bp_is_activity_component() ) || !bp_is_current_action( 'p' ) )
         return false;
 
@@ -44 +44 @@
         // Activity is a user update
         if ( !empty( $activity->user_id ) ) {
-            $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->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 . '/';
 
         // Activity is something else
@@ -51 +51 @@
             // Set redirect to group activity stream
             if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) ) {
-                $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id . '/';
+                $redirect = bp_get_group_permalink( $group ) . bp_get_activity_slug() . '/' . $activity->id . '/';
             }
         }
@@ -57 +57 @@
     // Set redirect to users' activity stream
     } else {
-        $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->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;
     }
 
@@ -126 +126 @@
 
     // Do not proceed if user is not logged in, not viewing activity, or not posting
-    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'post' ) )
+    if ( !is_user_logged_in() || bp_is_activity_component() || !bp_is_current_action( 'post' ) )
         return false;
 
@@ -172 +172 @@
     global $bp;
 
-    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'reply' ) )
+    if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'reply' ) )
         return false;
 
@@ -204 +204 @@
     global $bp;
 
-    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'favorite' ) )
+    if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'favorite' ) )
         return false;
 
@@ -222 +222 @@
     global $bp;
 
-    if ( !is_user_logged_in() || ( $bp->activity->slug != bp_current_component() ) || !bp_is_current_action( 'unfavorite' ) )
+    if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'unfavorite' ) )
         return false;
 

trunk/bp-activity/bp-activity-functions.php

@@ -126 +126 @@
             $activity_id      = $item_id;
             $poster_user_id   = $secondary_item_id;
-            $at_mention_link  = $bp->loggedin_user->domain . $bp->activity->slug . '/mentions/';
+            $at_mention_link  = bp_displayed_user_domain() . bp_get_activity_slug() . '/mentions/';
             $at_mention_title = sprintf( __( '@%s Mentions', 'buddypress' ), $bp->loggedin_user->userdata->user_nicename );
 

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

@@ -147 +147 @@
         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->activity->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 ) ) );
     }
 

trunk/bp-activity/bp-activity-template.php

@@ -249 +249 @@
 
     // Support for permalinks on single item pages: /groups/my-group/activity/124/
-    if ( $bp->current_action == $bp->activity->slug )
+    if ( bp_is_current_action( bp_get_activity_slug() ) )
         $include = $bp->action_variables[0];
 
@@ -1032 +1032 @@
         global $bp;
         
-        $link = wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/?cid=' . bp_get_activity_comment_id(), 'bp_activity_delete_link' );
+        $link = wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/delete/?cid=' . bp_get_activity_comment_id(), 'bp_activity_delete_link' );
         
         return apply_filters( 'bp_activity_comment_delete_link', $link );
@@ -1364 +1364 @@
             return false;
 
-        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->activity->slug . '/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
+        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
     }
 
@@ -1440 +1440 @@
         global $bp;
 
-        if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action )
-            $link = $bp->displayed_user->domain . $bp->activity->slug . '/feed/';
-        elseif ( bp_is_active( 'friends' ) && $bp->friends->slug == $bp->current_action )
-            $link = $bp->displayed_user->domain . $bp->activity->slug . '/' . $bp->friends->slug . '/feed/';
-        elseif ( bp_is_active( 'groups' ) && $bp->groups->slug == $bp->current_action )
-            $link = $bp->displayed_user->domain . $bp->activity->slug . '/' . $bp->groups->slug . '/feed/';
+        if ( bp_is_profile_component() || bp_is_current_action( 'just-me' ) )
+            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/feed/';
+        elseif ( bp_is_active( 'friends' ) && bp_is_current_action( bp_get_friends_slug() ) )
+            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed/';
+        elseif ( bp_is_active( 'groups'  ) && bp_is_current_action( bp_get_groups_slug()  ) )
+            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/feed/';
         elseif ( 'favorites' == $bp->current_action )
-            $link = $bp->displayed_user->domain . $bp->activity->slug . '/favorites/feed/';
+            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/favorites/feed/';
         elseif ( 'mentions' == $bp->current_action )
-            $link = $bp->displayed_user->domain . $bp->activity->slug . '/mentions/feed/';
+            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/mentions/feed/';
         else
             $link = '';

trunk/bp-activity/feeds/bp-activity-friends-feed.php

@@ -21 +21 @@
     <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-    <link><?php echo $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' ?></link>
+    <link><?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/my-friends/feed' ?></link>
     <description><?php printf( __( '%s - Friends Activity Feed', 'buddypress' ), $bp->displayed_user->fullname ) ?></description>
     <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?></pubDate>

trunk/bp-activity/feeds/bp-activity-group-feed.php

@@ -21 +21 @@
     <title><?php bp_site_name() ?> | <?php echo $bp->groups->current_group->name ?> | <?php _e( 'Group Activity', 'buddypress' ) ?></title>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-    <link><?php echo bp_get_group_permalink( $bp->groups->current_group ) . $bp->activity->slug . '/feed' ?></link>
+    <link><?php echo bp_get_group_permalink( $bp->groups->current_group ) . bp_get_activity_slug() . '/feed' ?></link>
     <description><?php printf( __( '%s - Group Activity Feed', 'buddypress' ), $bp->groups->current_group->name  ) ?></description>
     <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?></pubDate>

trunk/bp-activity/feeds/bp-activity-personal-feed.php

@@ -21 +21 @@
     <title><?php bp_site_name() ?> | <?php echo $bp->displayed_user->fullname; ?> | <?php _e( 'Activity', 'buddypress' ) ?></title>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-    <link><?php echo $bp->displayed_user->domain . $bp->activity->slug . '/feed' ?></link>
+    <link><?php echo bp_displayed_user_domain() . bp_get_activity_slug() . '/feed' ?></link>
     <description><?php printf( __( '%s - Activity Feed', 'buddypress' ), $bp->displayed_user->fullname ) ?></description>
     <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?></pubDate>

trunk/bp-activity/feeds/bp-activity-sitewide-feed.php

@@ -22 +22 @@
     <title><?php bp_site_name() ?> | <?php _e( 'Site Wide Activity', 'buddypress' ) ?></title>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-    <link><?php echo site_url() . '/' . $bp->activity->slug . '/feed' ?></link>
+    <link><?php echo bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/feed' ?></link>
     <description><?php _e( 'Site Wide Activity Feed', 'buddypress' ) ?></description>
     <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_activity_get_last_updated(), false); ?></pubDate>

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

@@ -442 +442 @@
     global $bp;
 
-    if ( !bp_is_groups_component() || !bp_is_active( 'activity' ) || ( bp_is_active( 'activity' ) && !bp_is_current_action( $bp->activity->slug ) ) || empty( $bp->action_variables[0] ) )
+    if ( !bp_is_groups_component() || !bp_is_active( 'activity' ) || ( bp_is_active( 'activity' ) && !bp_is_current_action( bp_get_activity_slug() ) ) || empty( $bp->action_variables[0] ) )
         return false;
 

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

@@ -678 +678 @@
 
 function bp_group_is_activity_permalink() {
-    global $bp;
-
-    if ( !bp_is_single_item() || !bp_is_current_component( 'groups' ) || !bp_is_current_action( $bp->activity->slug ) )
+
+    if ( !bp_is_single_item() || !bp_is_current_component( 'groups' ) || !bp_is_current_action( bp_get_activity_slug() ) )
         return false;
 
@@ -715 +714 @@
 }
 
-function bp_group_total_members() {
-    echo bp_get_group_total_members();
+function bp_group_total_members( $group = false ) {
+    echo bp_get_group_total_members( $group );
 }
     function bp_get_group_total_members( $group = false ) {

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -224 +224 @@
                     <?php if ( bp_activity_user_can_delete() ) : ?>
                         <div class="acomment-options">
-                            <a href="<?php echo wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/' . bp_get_activity_id() . '?cid=' . $comment_id, 'bp_activity_delete_link' ) ?>" class="delete acomment-delete confirm bp-secondary-action" rel="nofollow"><?php _e( 'Delete', 'buddypress' ); ?></a>
+                            <a href="<?php echo wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/delete/' . bp_get_activity_id() . '?cid=' . $comment_id, 'bp_activity_delete_link' ) ?>" class="delete acomment-delete confirm bp-secondary-action" rel="nofollow"><?php _e( 'Delete', 'buddypress' ); ?></a>
                         </div>
                     <?php endif; ?>