Changeset 4553

Timestamp:

06/22/2011 11:40:13 AM (14 years ago)

Author:

boonebgorges

Message:

Pass activity object to bp_activity_get_permalink filter. Fixes #3296. Props r-a-y

File:

• trunk/bp-activity/bp-activity-functions.php (modified) (5 diffs)

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

@@ -68 +68 @@
             if ( !$new_mentions = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ), true ) )
                 $new_mentions = array();
-                
+
             switch ( $action ) {
                 case 'delete' :
@@ -76 +76 @@
                     }
                     break;
-                
+
                 case 'add' :
                 default :
@@ -84 +84 @@
                     break;
             }
-            
-            // Get an updated mention count         
+
+            // Get an updated mention count
             $new_mention_count = count( $new_mentions );
-            
+
             // Resave the user_meta
             update_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), $new_mention_count );
@@ -876 +876 @@
     }
 
+/**
+ * Get the permalink for a single activity item
+ *
+ * When only the $activity_id param is passed, BP has to instantiate a new BP_Activity_Activity
+ * object. To save yourself some processing overhead, be sure to pass the full $activity_obj param
+ * as well, if you already have it available.
+ *
+ * @package BuddyPress
+ *
+ * @uses apply_filters_ref_array() Filter 'bp_activity_get_permalink' to modify the function output
+ * @param int $activity_id The unique id of the activity object
+ * @param obj $activity_obj (optional) The activity object
+ * @return str $link Permalink for the activity item
+ */
 function bp_activity_get_permalink( $activity_id, $activity_obj = false ) {
     global $bp;
@@ -891 +905 @@
     }
 
-    return apply_filters( 'bp_activity_get_permalink', $link );
+    return apply_filters_ref_array( 'bp_activity_get_permalink', array( $link, &$activity_obj ) );
 }