Changeset 5109

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

-                      r5072
+                      r5109
 <?php
+/*******************************************************************************
+/**
  * Action functions are exactly the same as screen functions, however they do
  * not have a template screen associated with them. Usually they will send the
  * user back to the default screen after execution.
+ *
+ * @package BuddyPress
+ * @subpackage ActivityActions
  */
 …
 if ( !defined( 'ABSPATH' ) ) exit;
+// Allow core components and dependent plugins to register activity actions
+/**
+ * Allow core components and dependent plugins to register activity actions
+ *
+ * @since 1.2.0
+ *
+ * @uses do_action() To call 'bp_register_activity_actions' hook.
+ */
 function bp_register_activity_actions() {
     do_action( 'bp_register_activity_actions' );
 …
 add_action( 'bp_init', 'bp_register_activity_actions', 8 );
+/**
+ * Allow core components and dependent plugins to register activity actions
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_is_activity_component()
+ * @uses bp_is_current_action()
+ * @uses bp_action_variable()
+ * @uses bp_activity_get_specific()
+ * @uses bp_is_active()
+ * @uses bp_core_get_user_domain()
+ * @uses groups_get_group()
+ * @uses bp_get_group_permalink()
+ * @uses apply_filters_ref_array() To call the 'bp_activity_permalink_redirect_url' hook
+ * @uses bp_core_redirect()
+ * @uses bp_get_root_domain()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_permalink_router() {
     global $bp;
 …
 /**
- * bp_activity_action_delete_activity()
+ *
  * Delete specific activity item and redirect to previous page.
+ *
+ * @global object $bp
+ * @since 1.1
+ * @since 1.1.0
+ *
+ * @param int $activity_id Activity id to be deleted. Defaults to 0.
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_is_activity_component()
+ * @uses bp_is_current_action()
+ * @uses bp_action_variable()
+ * @uses check_admin_referer()
+ * @uses bp_activity_user_can_delete()
+ * @uses do_action() Calls 'bp_activity_before_action_delete_activity' hook to allow actions to be taken before the activity is deleted.
+ * @uses bp_activity_delete()
+ * @uses bp_core_add_message()
  * @uses do_action() Calls 'bp_activity_action_delete_activity' hook to allow actions to be taken after the activity is deleted.
+ * @uses do_action() Calls 'bp_activity_before_action_delete_activity' hook to allow actions to be taken before the activity is deleted.
+ * @uses bp_core_redirect()
+ *
+ * @return bool False on failure
  */
 function bp_activity_action_delete_activity( $activity_id = 0 ) {
 …
 add_action( 'bp_actions', 'bp_activity_action_delete_activity' );
+/**
+ * Post user/group activity update.
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses is_user_logged_in()
+ * @uses bp_is_activity_component()
+ * @uses bp_is_current_action()
+ * @uses check_admin_referer()
+ * @uses apply_filters() To call 'bp_activity_post_update_content' hook.
+ * @uses apply_filters() To call 'bp_activity_post_update_object' hook.
+ * @uses apply_filters() To call 'bp_activity_post_update_item_id' hook.
+ * @uses bp_core_add_message()
+ * @uses bp_core_redirect()
+ * @uses bp_activity_post_update()
+ * @uses groups_post_update()
+ * @uses bp_core_redirect()
+ * @uses apply_filters() To call 'bp_activity_custom_update' hook.
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_post_update() {
     global $bp;
 …
 add_action( 'bp_actions', 'bp_activity_action_post_update' );
+/**
+ * Post new activity comment.
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses is_user_logged_in()
+ * @uses bp_is_activity_component()
+ * @uses bp_is_current_action()
+ * @uses check_admin_referer()
+ * @uses apply_filters() To call 'bp_activity_post_comment_activity_id' hook.
+ * @uses apply_filters() To call 'bp_activity_post_comment_content' hook.
+ * @uses bp_core_add_message()
+ * @uses bp_core_redirect()
+ * @uses bp_activity_new_comment()
+ * @uses wp_get_referer()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_post_comment() {
     global $bp;
 …
 add_action( 'bp_actions', 'bp_activity_action_post_comment' );
+/**
+ * Mark activity as favorite.
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses is_user_logged_in()
+ * @uses bp_is_activity_component()
+ * @uses bp_is_current_action()
+ * @uses check_admin_referer()
+ * @uses bp_activity_add_user_favorite()
+ * @uses bp_action_variable()
+ * @uses bp_core_add_message()
+ * @uses bp_core_redirect()
+ * @uses wp_get_referer()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_mark_favorite() {
     global $bp;
 …
 add_action( 'bp_actions', 'bp_activity_action_mark_favorite' );
+/**
+ * Remove activity from favorites.
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses is_user_logged_in()
+ * @uses bp_is_activity_component()
+ * @uses bp_is_current_action()
+ * @uses check_admin_referer()
+ * @uses bp_activity_remove_user_favorite()
+ * @uses bp_action_variable()
+ * @uses bp_core_add_message()
+ * @uses bp_core_redirect()
+ * @uses wp_get_referer()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_remove_favorite() {
     global $bp;
 …
 add_action( 'bp_actions', 'bp_activity_action_remove_favorite' );
+/**
+ * Load the sitewide feed.
+ *
+ * @since 1.0.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @global object $wp_query
+ * @uses bp_is_activity_component()
+ * @uses bp_is_current_action()
+ * @uses bp_is_user()
+ * @uses status_header()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_sitewide_feed() {
     global $bp, $wp_query;
 …
 add_action( 'bp_actions', 'bp_activity_action_sitewide_feed' );
+/**
+ * Load a user's personal feed.
+ *
+ * @since 1.0.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @global object $wp_query
+ * @uses bp_is_user_activity()
+ * @uses bp_is_current_action()
+ * @uses status_header()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_personal_feed() {
     global $bp, $wp_query;
 …
 add_action( 'bp_actions', 'bp_activity_action_personal_feed' );
+/**
+ * Load a user's friends feed.
+ *
+ * @since 1.0.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @global object $wp_query
+ * @uses bp_is_active()
+ * @uses bp_is_user_activity()
+ * @uses bp_is_current_action()
+ * @uses bp_get_friends_slug()
+ * @uses bp_is_action_variable()
+ * @uses status_header()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_friends_feed() {
     global $bp, $wp_query;
 …
 add_action( 'bp_actions', 'bp_activity_action_friends_feed' );
+/**
+ * Load a user's my groups feed.
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @global object $wp_query
+ * @uses bp_is_active()
+ * @uses bp_is_user_activity()
+ * @uses bp_is_current_action()
+ * @uses bp_get_groups_slug()
+ * @uses bp_is_action_variable()
+ * @uses status_header()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_my_groups_feed() {
     global $bp, $wp_query;
 …
 add_action( 'bp_actions', 'bp_activity_action_my_groups_feed' );
+/**
+ * Load a user's @mentions feed.
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @global object $wp_query
+ * @uses bp_is_user_activity()
+ * @uses bp_is_current_action()
+ * @uses bp_is_action_variable()
+ * @uses status_header()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_mentions_feed() {
     global $bp, $wp_query;
 …
 add_action( 'bp_actions', 'bp_activity_action_mentions_feed' );
+/**
+ * Load a user's favorites feed.
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @global object $wp_query
+ * @uses bp_is_user_activity()
+ * @uses bp_is_current_action()
+ * @uses bp_is_action_variable()
+ * @uses status_header()
+ *
+ * @return bool False on failure
+ */
 function bp_activity_action_favorites_feed() {
     global $bp, $wp_query;

trunk/bp-activity/bp-activity-classes.php

-                      r4961
+                      r5109
 <?php
+/**
+ * BuddyPress Activity Classes
+ *
+ * @package BuddyPress
+ * @subpackage ActivityClasses
+ */
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;

trunk/bp-activity/bp-activity-filters.php

-                      r4989
+                      r5109
 <?php
+/**
+ * The Activity filters
+ *
+ * @package BuddyPress
+ * @subpackage ActivityFilters
+ */
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 …
 add_filter( 'bp_get_activity_parent_content',        'bp_create_excerpt' );
+/**
+ * Custom kses filtering for activity content
+ *
+ * @since 1.1.0
+ *
+ * @param string $content The activity content
+ *
+ * @uses apply_filters() To call the 'bp_activity_allowed_tags' hook.
+ * @uses wp_kses()
+ *
+ * @return string $content Filtered activity content
+ */
 function bp_activity_filter_kses( $content ) {
     global $allowedtags;
 …
  * Finds and links @-mentioned users in the contents of activity items
+ *
  * @package BuddyPress Activity
+ * @since 1.2.0
+ *
  * @param string $content The activity content
+ * @param int $activity_id When $adjust_mention_count is true, you must provide an $activity_id,
+ *   which will be added to the list of the user's unread mentions
+ * @param int $activity_id The activity id
+ *
+ * @uses bp_activity_find_mentions()
+ * @uses bp_is_username_compatibility_mode()
+ * @uses bp_core_get_userid_from_nicename()
+ * @uses bp_activity_at_message_notification()
+ * @uses bp_core_get_user_domain()
+ * @uses bp_activity_adjust_mention_count()
+ *
+ * @return string $content Content filtered for mentions
  */
 function bp_activity_at_name_filter( $content, $activity_id = 0 ) {
 …
  * Catch mentions in saved activity items
+ *
+ * @package BuddyPress
+ * @since 1.5
+ * @since 1.5.0
+ *
  * @param obj $activity
+ *
+ * @uses remove_filter() To remove the 'bp_activity_at_name_filter_updates' hook.
+ * @uses bp_activity_at_name_filter()
+ * @uses BP_Activity_Activity::save() {@link BP_Activity_Activity}
  */
 function bp_activity_at_name_filter_updates( $activity ) {
 …
 add_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter_updates' );
+/**
+ * Catches links in activity text so rel=nofollow can be added
+ *
+ * @since 1.2.0
+ *
+ * @param string $text Activity text
+ *
+ * @return string $text Text with rel=nofollow added to any links
+ */
 function bp_activity_make_nofollow_filter( $text ) {
     return preg_replace_callback( '|<a (.+?)>|i', 'bp_activity_make_nofollow_filter_callback', $text );
+}
+    /**
+     * Adds rel=nofollow to a link
+     *
+     * @since 1.2.0
+     *
+     * @param array $matches
+     *
+     * @return string $text Link with rel=nofollow added
+     */
     function bp_activity_make_nofollow_filter_callback( $matches ) {
         $text = $matches[1];
 …
  * Truncates long activity entries when viewed in activity streams
+ *
  * @package BuddyPress Activity
  * @since 1.5
+ * @since 1.5.0
+ *
  * @param $text The original activity entry text
+ * @return $excerpt The truncated text
+ *
+ * @uses bp_is_single_activity()
+ * @uses apply_filters() To call the 'bp_activity_excerpt_append_text' hook
+ * @uses apply_filters() To call the 'bp_activity_excerpt_length' hook
+ * @uses bp_create_excerpt()
+ * @uses bp_get_activity_id()
+ * @uses bp_get_activity_thread_permalink()
+ * @uses apply_filters() To call the 'bp_activity_truncate_entry' hook
+ *
+ * @return string $excerpt The truncated text
  */
 function bp_activity_truncate_entry( $text ) {
 …
 add_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
 add_filter( 'bp_get_activity_content', 'bp_activity_truncate_entry', 5 );
 ?>

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

-                      r4961
+                      r5109
 <?php
 /**
  * BuddyPress Activity Functions
 …
+ *
  * @package BuddyPress
  * @subpackage Activity Core
+ * @subpackage ActivityFunctions
  */
 …
  * Checks $bp pages global and looks for directory page
+ *
+ * @since 1.5
+ *
+ * @global object $bp Global BuddyPress settings object
+ * @since 1.5.0
+ *
+ * @global object $bp BuddyPress global settings
+ *
  * @return bool True if set, False if empty
  */
 …
  * Searches through the content of an activity item to locate usernames, designated by an @ sign
+ *
  * @package BuddyPress Activity
  * @since 1.5
+ *
  * @param str $content The content of the activity, usually found in $activity->content
  * @return array $usernames Array of the found usernames that match existing users
+ * @since 1.5.0
+ *
+ * @param string $content The content of the activity, usually found in $activity->content
+ *
+ * @return bool|array $usernames Array of the found usernames that match existing users. False if no matches
  */
 function bp_activity_find_mentions( $content ) {
 …
  * Resets a user's unread mentions list and count
+ *
+ * @package BuddyPress Activity
+ * @since 1.5
+ * @since 1.5.0
+ *
  * @param int $user_id The id of the user whose unread mentions are being reset
+ * @uses bp_delete_user_meta()
  */
 function bp_activity_clear_new_mentions( $user_id ) {
 …
  * Adjusts new mention count for mentioned users when activity items are deleted or created
+ *
+ * @package BuddyPress Activity
+ * @since 1.5
+ * @since 1.5.0
+ *
  * @param int $activity_id The unique id for the activity item
+ * @param string $action Can be 'delete' or 'add'. Defaults to 'add'
+ *
+ * @uses BP_Activity_Activity() {@link BP_Activity_Activity}
+ * @uses bp_activity_find_mentions()
+ * @uses bp_is_username_compatibility_mode()
+ * @uses bp_core_get_userid_from_nicename()
+ * @uses bp_get_user_meta()
+ * @uses bp_update_user_meta()
  */
 function bp_activity_adjust_mention_count( $activity_id, $action = 'add' ) {
 …
  * Formats notifications related to activity
+ *
+ * @package BuddyPress Activity
+ * @param str $action The type of activity item. Just 'new_at_mention' for now
+ * @since 1.5.0
+ *
+ * @param string $action The type of activity item. Just 'new_at_mention' for now
  * @param int $item_id The activity id
  * @param int $secondary_item_id In the case of at-mentions, this is the mentioner's id
  * @param int $total_items The total number of notifications to format
+ * @param str $format 'string' to get a BuddyBar-compatible notification, 'array' otherwise
+ * @param string $format 'string' to get a BuddyBar-compatible notification, 'array' otherwise
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_loggedin_user_domain()
+ * @uses bp_get_activity_slug()
+ * @uses bp_core_get_user_displayname()
+ * @uses apply_filters() To call the 'bp_activity_multiple_at_mentions_notification' hook
+ * @uses apply_filters() To call the 'bp_activity_single_at_mentions_notification' hook
+ * @uses do_action() To call 'activity_format_notifications' hook
+ *
+ * @return string $return Formatted @mention notification
  */
 function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
 …
+}
 /** Actions *******************************************************************/
+/** Actions ******************************************************************/
 /**
  * Sets the current action for a given activity stream location
+ *
+ * @global obj $bp
+ * @param str $component_id
+ * @param str $key
+ * @param str $value
+ * @return bool False on error, True on success
+ * @since 1.1.0
+ *
+ * @param string $component_id
+ * @param string $key
+ * @param string $value
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses apply_filters() To call the 'bp_activity_set_action' hook
+ *
+ * @return bool False if any param is empty, otherwise true
  */
 function bp_activity_set_action( $component_id, $key, $value ) {
 …
  * Retreives the current action from a component and key
+ *
+ * @global obj $bp
+ * @param str $component_id
+ * @param str $key
+ * @since 1.1.0
+ *
+ * @param string $component_id
+ * @param string $key
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses apply_filters() To call the 'bp_activity_get_action' hook
+ *
  * @return mixed False on error, action on success
  */
 …
+}
 /** Favorites *****************************************************************/
+/** Favorites ****************************************************************/
 /**
  * Get a users favorite activity stream items
+ *
+ * @global obj $bp
+ * @since 1.2.0
+ *
  * @param int $user_id
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_get_user_meta()
+ * @uses apply_filters() To call the 'bp_activity_get_user_favorites' hook
+ *
  * @return array Array of users favorite activity stream ID's
  */
 …
  * Add an activity stream item as a favorite for a user
+ *
+ * @global obj $bp
+ * @since 1.2.0
+ *
  * @param int $activity_id
  * @param int $user_id
+ * @return bool
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses is_user_logged_in()
+ * @uses bp_get_user_meta()
+ * @uses bp_activity_get_meta()
+ * @uses bp_update_user_meta()
+ * @uses bp_activity_update_meta()
+ * @uses do_action() To call the 'bp_activity_add_user_favorite' hook
+ * @uses do_action() To call the 'bp_activity_add_user_favorite_fail' hook
+ *
+ * @return bool True on success, false on failure
  */
 function bp_activity_add_user_favorite( $activity_id, $user_id = 0 ) {
 …
+}
+/**
+ * Remove an activity stream item as a favorite for a user
+ *
+ * @since 1.2.0
+ *
+ * @param int $activity_id
+ * @param int $user_id
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses is_user_logged_in()
+ * @uses bp_get_user_meta()
+ * @uses bp_activity_get_meta()
+ * @uses bp_activity_update_meta()
+ * @uses bp_update_user_meta()
+ * @uses do_action() To call the 'bp_activity_remove_user_favorite' hook
+ *
+ * @return bool True on success, false on failure
+ */
 function bp_activity_remove_user_favorite( $activity_id, $user_id = 0 ) {
     global $bp;
 …
  * Check if activity exists by scanning content
+ *
+ * @param str $content
+ * @since 1.1.0
+ *
+ * @param string $content
+ *
+ * @uses BP_Activity_Activity::check_exists_by_content() {@link BP_Activity_Activity}
+ * @uses apply_filters() To call the 'bp_activity_check_exists_by_content' hook
+ *
  * @return bool
  */
 …
 /**
+ * Retreive the last time activity was updated
+ *
+ * @return str
+ * Retrieve the last time activity was updated
+ *
+ * @since 1.0.0
+ *
+ * @uses BP_Activity_Activity::get_last_updated() {@link BP_Activity_Activity}
+ * @uses apply_filters() To call the 'bp_activity_get_last_updated' hook
+ *
+ * @return string Date last updated
  */
 function bp_activity_get_last_updated() {
 …
 /**
+ * Retreive the number of favorite activity stream items a user has
+ *
+ * @global obj $bp
+ * Retrieve the number of favorite activity stream items a user has
+ *
+ * @since 1.2.0
+ *
  * @param int $user_id
+ * @return int
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses BP_Activity_Activity::total_favorite_count() {@link BP_Activity_Activity}
+ *
+ * @return int Total favorite count
  */
 function bp_activity_total_favorites_for_user( $user_id = 0 ) {
 …
+}
 /** Meta **********************************************************************/
+/** Meta *********************************************************************/
 /**
  * Delete a meta entry from the DB for an activity stream item
+ *
  * @global DB $wpdb
  * @global obj $bp
+ * @since 1.2.0
+ *
  * @param int $activity_id
+ * @param str $meta_key
+ * @param str $meta_value
+ * @return bool
+ * @param string $meta_key
+ * @param string $meta_value
+ *
+ * @global object $wpdb
+ * @global object $bp BuddyPress global settings
+ * @uses wp_cache_delete()
+ * @uses is_wp_error()
+ *
+ * @return bool True on success, false on failure
  */
 function bp_activity_delete_meta( $activity_id, $meta_key = '', $meta_value = '' ) {
 …
  * Get activity meta
+ *
  * @global DB $wpdb
  * @global obj $bp
+ * @since 1.2.0
+ *
  * @param int $activity_id
+ * @param str $meta_key
+ * @param string $meta_key
+ *
+ * @global object $wpdb
+ * @global object $bp BuddyPress global settings
+ * @uses wp_cache_get()
+ * @uses wp_cache_set()
+ * @uses apply_filters() To call the 'bp_activity_get_meta' hook
+ *
  * @return bool
  */
 …
  * Update activity meta
+ *
  * @global DB $wpdb
  * @global obj $bp
+ * @since 1.2.0
+ *
  * @param int $activity_id
+ * @param str $meta_key
+ * @param str $meta_value
+ * @return bool
+ * @param string $meta_key
+ * @param string $meta_value
+ *
+ * @global object $wpdb
+ * @global object $bp BuddyPress global settings
+ * @uses maybe_serialize()
+ * @uses bp_activity_delete_meta()
+ * @uses wp_cache_set()
+ *
+ * @return bool True on success, false on failure
  */
 function bp_activity_update_meta( $activity_id, $meta_key, $meta_value ) {
 …
+}
+/** Clean up ******************************************************************/
+/**
+ * Completely remove
+/** Clean up *****************************************************************/
+/**
+ * Completely remove a user's activity data
+ *
+ * @since 1.5.0
+ *
  * @param int $user_id
+ *
+ * @uses is_user_logged_in()
+ * @uses bp_activity_delete()
+ * @uses bp_delete_user_meta()
+ * @uses do_action() To call the 'bp_activity_remove_data' hook
+ * @uses do_action() To call the 'bp_activity_remove_all_user_data' hook
  */
 function bp_activity_remove_all_user_data( $user_id = 0 ) {
 …
  * Register the activity stream actions for updates
+ *
+ * @global obj $bp
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_activity_set_action()
+ * @uses do_action() To call the 'updates_register_activity_actions' hook
  */
 function updates_register_activity_actions() {
 …
 add_action( 'bp_register_activity_actions', 'updates_register_activity_actions' );
 /*******************************************************************************
+/******************************************************************************
  * Business functions are where all the magic happens in BuddyPress. They will
  * handle the actual saving or manipulation of information. Usually they will
 …
  */
+/**
+ * Retrieve an activity or activities
+ *
+ * @since 1.2.0
+ *
+ * @param array $args
+ *
+ * @uses wp_parse_args()
+ * @uses wp_cache_get()
+ * @uses wp_cache_set()
+ * @uses BP_Activity_Activity::get() {@link BP_Activity_Activity}
+ * @uses apply_filters_ref_array() To call the 'bp_activity_get' hook
+ *
+ * @return object $activity The activity/activities object
+ */
 function bp_activity_get( $args = '' ) {
     $defaults = array(
 …
  * Fetch specific activity items
+ *
  * @package BuddyPress
+ * @since 1.2.0
+ *
  * @param array $args See docs for $defaults for details
+ *
+ * @uses wp_parse_args()
+ * @uses apply_filters() To call the 'bp_activity_get_specific' hook
+ * @uses BP_Activity_Activity::get() {@link BP_Activity_Activity}
+ *
  * @return array The array returned by BP_Activity_Activity::get()
  */
 …
+}
+/**
+ * Add an activity item
+ *
+ * @since 1.1.0
+ *
+ * @param array $args See docs for $defaults for details
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses wp_parse_args()
+ * @uses BP_Activity_Activity::save() {@link BP_Activity_Activity}
+ * @uses BP_Activity_Activity::rebuild_activity_comment_tree() {@link BP_Activity_Activity}
+ * @uses wp_cache_delete()
+ * @uses do_action() To call the 'bp_activity_add' hook
+ *
+ * @return int The activity id
+ */
 function bp_activity_add( $args = '' ) {
     global $bp;
 …
+}
+/**
+ * Post an activity update
+ *
+ * @since 1.2.0
+ *
+ * @param array $args See docs for $defaults for details
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses wp_parse_args()
+ * @uses bp_core_is_user_spammer()
+ * @uses bp_core_is_user_deleted()
+ * @uses bp_core_get_userlink()
+ * @uses bp_activity_add()
+ * @uses apply_filters() To call the 'bp_activity_new_update_action' hook
+ * @uses apply_filters() To call the 'bp_activity_new_update_content' hook
+ * @uses apply_filters() To call the 'bp_activity_new_update_primary_link' hook
+ * @uses bp_update_user_meta()
+ * @uses wp_filter_kses()
+ * @uses do_action() To call the 'bp_activity_posted_update' hook
+ *
+ * @return int $activity_id The activity id
+ */
 function bp_activity_post_update( $args = '' ) {
     global $bp;
 …
+}
+/**
+ * Add an activity comment
+ *
+ * @since 1.2.0
+ *
+ * @param array $args See docs for $defaults for details
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses wp_parse_args()
+ * @uses bp_activity_add()
+ * @uses apply_filters() To call the 'bp_activity_comment_action' hook
+ * @uses apply_filters() To call the 'bp_activity_comment_content' hook
+ * @uses bp_activity_new_comment_notification()
+ * @uses wp_cache_delete()
+ * @uses do_action() To call the 'bp_activity_comment_posted' hook
+ *
+ * @return int $comment_id The comment id
+ */
 function bp_activity_new_comment( $args = '' ) {
     global $bp;
 …
 /**
- * bp_activity_get_activity_id()
+ *
  * Fetch the activity_id for an existing activity entry in the DB.
+ *
+ * @package BuddyPress Activity
+ * @since 1.2.0
+ *
+ * @param array $args See docs for $defaults for details
+ *
+ * @uses wp_parse_args()
+ * @uses apply_filters() To call the 'bp_activity_get_activity_id' hook
+ * @uses BP_Activity_Activity::save() {@link BP_Activity_Activity}
+ *
+ * @return int $activity_id The activity id
  */
 function bp_activity_get_activity_id( $args = '' ) {
 …
+}
 /***
+/**
  * Deleting Activity
+ *
 …
+ *
  * If you are deleting an activity comment please use bp_activity_delete_comment();
+*/
+ *
+ * @since 1.0.0
+ *
+ * @param array $args See docs for $defaults for details
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses wp_parse_args()
+ * @uses bp_activity_adjust_mention_count()
+ * @uses BP_Activity_Activity::delete() {@link BP_Activity_Activity}
+ * @uses do_action() To call the 'bp_before_activity_delete' hook
+ * @uses bp_get_user_meta()
+ * @uses bp_delete_user_meta()
+ * @uses do_action() To call the 'bp_activity_delete' hook
+ * @uses do_action() To call the 'bp_activity_deleted_activities' hook
+ * @uses wp_cache_delete()
+ *
+ * @return bool True on success, false on failure
+ */
 function bp_activity_delete( $args = '' ) {
     global $bp;
 …
     return true;
+}
+    // The following functions have been deprecated in place of bp_activity_delete()
+    /**
+     * Delete an activity item by activity id
+     *
+     * You should use bp_activity_delete() instead
+     *
+     * @since 1.1.0
+     * @deprecated 1.2.0
+     *
+     * @param array $args See docs for $defaults for details
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses wp_parse_args()
+     * @uses bp_activity_delete()
+     *
+     * @return bool True on success, false on failure
+     */
     function bp_activity_delete_by_item_id( $args = '' ) {
         global $bp;
 …
+    }
+    /**
+     * Delete an activity item by activity id
+     *
+     * You should use bp_activity_delete() instead
+     *
+     * @since 1.1.0
+     * @deprecated 1.2.0
+     *
+     * @param int $activity_id The activity id
+     *
+     * @uses bp_activity_delete()
+     *
+     * @return bool True on success, false on failure
+     */
     function bp_activity_delete_by_activity_id( $activity_id ) {
         return bp_activity_delete( array( 'id' => $activity_id ) );
+    }
+    /**
+     * Delete an activity item by it's content
+     *
+     * You should use bp_activity_delete() instead
+     *
+     * @since 1.1.0
+     * @deprecated 1.2.0
+     *
+     * @param int $user_id The user id
+     * @param string $content The activity id
+     * @param string $component The activity component
+     * @param string $type The activity type
+     *
+     * @uses bp_activity_delete()
+     *
+     * @return bool True on success, false on failure
+     */
     function bp_activity_delete_by_content( $user_id, $content, $component, $type ) {
         return bp_activity_delete( array( 'user_id' => $user_id, 'content' => $content, 'component' => $component, 'type' => $type ) );
+    }
+    /**
+     * Delete a user's activity for a component
+     *
+     * You should use bp_activity_delete() instead
+     *
+     * @since 1.1.0
+     * @deprecated 1.2.0
+     *
+     * @param int $user_id The user id
+     * @param string $component The activity component
+     *
+     * @uses bp_activity_delete()
+     *
+     * @return bool True on success, false on failure
+     */
     function bp_activity_delete_for_user_by_component( $user_id, $component ) {
         return bp_activity_delete( array( 'user_id' => $user_id, 'component' => $component ) );
+    }
+    // End deprecation
+/**
+ * Delete an activity comment
+ *
+ * @since 1.2.0
+ *
+ * @param int $activity_id The activity id
+ * @param int $comment_id The activity comment id
+ *
+ * @uses apply_filters() To call the 'bp_activity_delete_comment_pre' hook
+ * @uses bp_activity_delete_children()
+ * @uses bp_activity_delete()
+ * @uses BP_Activity_Activity::rebuild_activity_comment_tree() {@link BP_Activity_Activity}
+ * @uses do_action() To call the 'bp_activity_delete_comment' hook
+ *
+ * @return bool True on success, false on failure
+ */
 function bp_activity_delete_comment( $activity_id, $comment_id ) {
     /***
 …
     return true;
+}
+    /**
+     * Delete an activity comment's children
+     *
+     * @since 1.2.0
+     *
+     * @param int $activity_id The activity id
+     * @param int $comment_id The activity comment id
+     *
+     * @uses BP_Activity_Activity::get_child_comments() {@link BP_Activity_Activity}
+     * @uses bp_activity_delete_children()
+     * @uses bp_activity_delete()
+     */
     function bp_activity_delete_children( $activity_id, $comment_id) {
         // Recursively delete all children of this comment.
 …
  * 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
+ * @since 1.2.0
+ *
  * @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
+ * @param object $activity_obj (optional) The activity object
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_get_root_domain()
+ * @uses bp_get_activity_root_slug()
+ * @uses apply_filters_ref_array() To call the 'bp_activity_get_permalink' hook
+ *
+ * @return string $link Permalink for the activity item
  */
 function bp_activity_get_permalink( $activity_id, $activity_obj = false ) {
 …
+}
+/**
+ * Hide a user's activity
+ *
+ * @since 1.2.0
+ *
+ * @param int $user_id The user id
+ *
+ * @uses BP_Activity_Activity::hide_all_for_user() {@link BP_Activity_Activity}
+ *
+ * @return bool True on success, false on failure
+ */
 function bp_activity_hide_user_activity( $user_id ) {
     return BP_Activity_Activity::hide_all_for_user( $user_id );
 …
 /**
- * bp_activity_thumbnail_content_images()
+ *
  * Take content, remove all images and replace them with one thumbnail image.
+ *
+ * @package BuddyPress Activity
+ * @param $content str - The content to work with
+ * @param $link str - Optional. The URL that the image should link to
+ * @return $content str - The content with images stripped and replaced with a single thumb.
+ * @since 1.2.0
+ *
+ * @param string $content The content to work with
+ * @param string $link Optional. The URL that the image should link to
+ *
+ * @uses esc_attr()
+ * @uses apply_filters() To call the 'bp_activity_thumbnail_content_images' hook
+ *
+ * @return string $content The content with images stripped and replaced with a single thumb.
  */
 function bp_activity_thumbnail_content_images( $content, $link = false ) {
 …
  * For that, see {@link bp_activity_comment_embed()}.
+ *
+ * @since 1.5
+ *
  * @see BP_Embed
  * @see bp_embed_activity_cache()
  * @see bp_embed_activity_save_cache()
+ * @package BuddyPress Activity
+ * @since 1.5
+ *
+ * @uses add_filter() To attach 'bp_get_activity_id' to 'embed_post_id'
+ * @uses add_filter() To attach 'bp_embed_activity_cache' to 'bp_embed_get_cache'
+ * @uses add_action() To attach 'bp_embed_activity_save_cache' to 'bp_embed_update_cache'
  */
 function bp_activity_embed() {
 …
  * If no cache and link is embeddable, cache it.
+ *
+ * @since 1.5
+ *
  * @see BP_Embed
  * @see bp_embed_activity_cache()
  * @see bp_embed_activity_save_cache()
+ * @package BuddyPress Activity
+ * @since 1.5
+ *
+ * @uses add_filter() To attach 'bp_get_activity_comment_id' to 'embed_post_id'
+ * @uses add_filter() To attach 'bp_embed_activity_cache' to 'bp_embed_get_cache'
+ * @uses add_action() To attach 'bp_embed_activity_save_cache' to 'bp_embed_update_cache'
  */
 function bp_activity_comment_embed() {
 …
  * When a user clicks on a "Read More" item, make sure embeds are correctly parsed and shown for the expanded content.
+ *
  * @global object $bp BuddyPress global settings
  * @param BP_Activity_Activity $activity The activity that is being expanded
+ * @since 1.5
+ *
  * @see BP_Embed
+ * @since 1.5
+ *
+ * @param object $activity The activity that is being expanded
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses add_filter() To attach create_function() to 'embed_post_id'
+ * @uses add_filter() To attach 'bp_embed_activity_cache' to 'bp_embed_get_cache'
+ * @uses add_action() To attach 'bp_embed_activity_save_cache' to 'bp_embed_update_cache'
  */
 function bp_dtheme_embed_read_more( $activity ) {
 …
  * {@link bp_activity_embed()} or any other component embeds.
+ *
+ * @since 1.5
+ *
  * @see bp_activity_comment_embed()
  * @package BuddyPress Activity
  * @since 1.5
+ *
+ * @uses remove_filter() To remove 'bp_get_activity_comment_id' from 'embed_post_id'
  */
 function bp_activity_comment_embed_after_recurse() {
 …
  * Used during {@link BP_Embed::parse_oembed()} via {@link bp_activity_embed()}.
+ *
- * @package BuddyPress Activity
  * @since 1.5
+ *
+ * @uses bp_activity_get_meta()
+ *
+ * @return mixed The activity meta
  */
 function bp_embed_activity_cache( $cache, $id, $cachekey ) {
 …
  * Used during {@link BP_Embed::parse_oembed()} via {@link bp_activity_embed()}.
+ *
- * @package BuddyPress Activity
  * @since 1.5
+ *
+ * @uses bp_activity_update_meta()
  */
 function bp_embed_activity_save_cache( $cache, $cachekey, $id ) {

trunk/bp-activity/bp-activity-loader.php

-                      r4961
+                      r5109
 <?php
 /**
  * BuddyPress Activity Streams Loader
 …
+ *
  * @package BuddyPress
  * @subpackage Activity Core
+ * @subpackage ActivityCore
  */
 …
 if ( !defined( 'ABSPATH' ) ) exit;
+/**
+ * Main Activity Class
+ *
+ * @since 1.5.0
+ */
 class BP_Activity_Component extends BP_Component {
 …
      * Start the activity component creation process
+     *
      * @since 1.5
+     * @since 1.5.0
      */
     function BP_Activity_Component() {
 …
     /**
      * Include files
+     *
+     * @since 1.5.0
      */
     function includes() {
 …
      * backwards compatibility.
+     *
+     * @since 1.5
+     * @global obj $bp
+     * @since 1.5.0
+     *
+     * @global object $bp BuddyPress global settings
      */
     function setup_globals() {
 …
      * Setup BuddyBar navigation
+     *
+     * @global obj $bp
+     * @since 1.5.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses bp_is_active()
+     * @uses is_user_logged_in()
+     * @uses bp_get_friends_slug()
+     * @uses bp_get_groups_slug()
      */
     function setup_nav() {
 …
      * Set up the admin bar
+     *
+     * @global obj $bp
+     * @since 1.5.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses is_user_logged_in()
+     * @uses trailingslashit()
+     * @uses bp_get_total_mention_count_for_user()
+     * @uses bp_loggedin_user_id()
+     * @uses bp_is_active()
+     * @uses bp_get_friends_slug()
+     * @uses bp_get_groups_slug()
      */
     function setup_admin_bar() {
 …
      * Sets up the title for pages and <title>
+     *
+     * @global obj $bp
+     * @since 1.5.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses bp_is_activity_component()
+     * @uses bp_is_my_profile()
+     * @uses bp_core_fetch_avatar()
      */
     function setup_title() {
 …
+    }
+}
 // Create the activity component
 $bp->activity = new BP_Activity_Component();

trunk/bp-activity/bp-activity-notifications.php

-                      r4961
+                      r5109
 <?php
+/**
+ * BuddyPress Activity Notifications
+ *
+ * @package BuddyPress
+ * @subpackage ActivityNotifications
+ */
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 …
  * Sends an email notification and a BP notification when someone mentions you in an update
+ *
+ * @package BuddyPress Activity
+ * @param str $content The content of the activity update
+ * @param int $poster_user_id The unique user_id of the user who sent the update
+ * @since 1.2.0
+ *
  * @param int $activity_id The id of the activity update
+ * @param int $receiver_user_id The unique user_id of the user who is receiving the update
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_core_add_notification()
+ * @uses bp_get_user_meta()
+ * @uses bp_core_get_user_displayname()
+ * @uses bp_activity_get_permalink()
+ * @uses bp_core_get_user_domain()
+ * @uses bp_get_settings_slug()
+ * @uses bp_activity_filter_kses()
+ * @uses bp_core_get_core_userdata()
+ * @uses wp_specialchars_decode()
+ * @uses get_blog_option()
+ * @uses bp_is_active()
+ * @uses bp_is_group()
+ * @uses bp_get_current_group_name()
+ * @uses apply_filters() To call the 'bp_activity_at_message_notification_to' hook
+ * @uses apply_filters() To call the 'bp_activity_at_message_notification_subject' hook
+ * @uses apply_filters() To call the 'bp_activity_at_message_notification_message' hook
+ * @uses wp_mail()
+ * @uses do_action() To call the 'bp_activity_sent_mention_email' hook
  */
 function bp_activity_at_message_notification( $activity_id, $receiver_user_id ) {
 …
+}
+/**
+ * Sends an email notification and a BP notification when someone mentions you in an update
+ *
+ * @since 1.2.0
+ *
+ * @param int $comment_id The comment id
+ * @param int $commenter_id The unique user_id of the user who posted the comment
+ * @param array $params {@link bp_activity_new_comment()}
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_get_user_meta()
+ * @uses bp_core_get_user_displayname()
+ * @uses bp_activity_get_permalink()
+ * @uses bp_core_get_user_domain()
+ * @uses bp_get_settings_slug()
+ * @uses bp_activity_filter_kses()
+ * @uses bp_core_get_core_userdata()
+ * @uses wp_specialchars_decode()
+ * @uses get_blog_option()
+ * @uses bp_get_root_blog_id()
+ * @uses apply_filters() To call the 'bp_activity_new_comment_notification_to' hook
+ * @uses apply_filters() To call the 'bp_activity_new_comment_notification_subject' hook
+ * @uses apply_filters() To call the 'bp_activity_new_comment_notification_message' hook
+ * @uses wp_mail()
+ * @uses do_action() To call the 'bp_activity_sent_reply_to_update_email' hook
+ * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_to' hook
+ * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_subject' hook
+ * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_message' hook
+ * @uses do_action() To call the 'bp_activity_sent_reply_to_reply_email' hook
+ */
 function bp_activity_new_comment_notification( $comment_id, $commenter_id, $params ) {
     global $bp;

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

-                      r4961
+                      r5109
 <?php
+/**
+ * BuddyPress Activity Screens
+ *
+ * @package BuddyPress
+ * @subpackage ActivityScreens
+ */
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 /**
+ * Activity index
+ *
+ * @global obj $bp
+ * Activity screen index
+ *
+ * @since 1.5.0
+ *
+ * @uses bp_displayed_user_id()
+ * @uses bp_is_activity_component()
+ * @uses bp_current_action()
+ * @uses bp_update_is_directory()
+ * @uses do_action() To call the 'bp_activity_screen_index' hook
+ * @uses bp_core_load_template()
+ * @uses apply_filters() To call the 'bp_activity_screen_index' hook
  */
 function bp_activity_screen_index() {
 …
 add_action( 'bp_screens', 'bp_activity_screen_index' );
+/**
+ * Activity screen 'my activity' index
+ *
+ * @since 1.0.0
+ *
+ * @uses do_action() To call the 'bp_activity_screen_my_activity' hook
+ * @uses bp_core_load_template()
+ * @uses apply_filters() To call the 'bp_activity_template_my_activity' hook
+ */
 function bp_activity_screen_my_activity() {
     do_action( 'bp_activity_screen_my_activity' );
 …
+}
+/**
+ * Activity screen 'friends' index
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_is_active()
+ * @uses bp_update_is_item_admin()
+ * @uses is_super_admin()
+ * @uses do_action() To call the 'bp_activity_screen_friends' hook
+ * @uses bp_core_load_template()
+ * @uses apply_filters() To call the 'bp_activity_template_friends_activity' hook
+ */
 function bp_activity_screen_friends() {
     if ( !bp_is_active( 'friends' ) )
 …
+}
+/**
+ * Activity screen 'groups' index
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_is_active()
+ * @uses bp_update_is_item_admin()
+ * @uses is_super_admin()
+ * @uses do_action() To call the 'bp_activity_screen_groups' hook
+ * @uses bp_core_load_template()
+ * @uses apply_filters() To call the 'bp_activity_template_groups_activity' hook
+ */
 function bp_activity_screen_groups() {
     if ( !bp_is_active( 'groups' ) )
 …
+}
+/**
+ * Activity screen 'favorites' index
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_update_is_item_admin()
+ * @uses is_super_admin()
+ * @uses do_action() To call the 'bp_activity_screen_favorites' hook
+ * @uses bp_core_load_template()
+ * @uses apply_filters() To call the 'bp_activity_template_favorite_activity' hook
+ */
 function bp_activity_screen_favorites() {
     bp_update_is_item_admin( is_super_admin(), 'activity' );
 …
+}
+/**
+ * Activity screen 'mentions' index
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_update_is_item_admin()
+ * @uses is_super_admin()
+ * @uses do_action() To call the 'bp_activity_screen_mentions' hook
+ * @uses bp_core_load_template()
+ * @uses apply_filters() To call the 'bp_activity_template_mention_activity' hook
+ */
 function bp_activity_screen_mentions() {
     bp_update_is_item_admin( is_super_admin(), 'activity' );
 …
 /**
- * bp_activity_remove_screen_notifications()
+ *
  * Removes activity notifications from the notification menu when a user clicks on them and
  * is taken to a specific screen.
+ *
+ * @package BuddyPress Activity
+ * @since 1.5.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_core_delete_notifications_by_type()
  */
 function bp_activity_remove_screen_notifications() {
 …
  * Reset the logged-in user's new mentions data when he visits his mentions screen
+ *
+ * @package BuddyPress Activity
+ * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_is_my_profile()
  * @uses bp_activity_clear_new_mentions()
  * @uses bp_is_my_profile()
+ * @uses bp_loggedin_user_id()
  */
 function bp_activity_reset_my_new_mentions() {
 …
 add_action( 'bp_activity_screen_mentions', 'bp_activity_reset_my_new_mentions' );
+/**
+ * Reset the logged-in user's new mentions data when he visits his mentions screen
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_is_activity_component()
+ * @uses bp_activity_get_specific()
+ * @uses bp_current_action()
+ * @uses bp_action_variables()
+ * @uses bp_do_404()
+ * @uses bp_is_active()
+ * @uses groups_get_group()
+ * @uses groups_is_user_member()
+ * @uses apply_filters_ref_array() To call the 'bp_activity_permalink_access' hook
+ * @uses do_action() To call the 'bp_activity_screen_single_activity_permalink' hook
+ * @uses bp_core_add_message()
+ * @uses is_user_logged_in()
+ * @uses bp_core_redirect()
+ * @uses site_url()
+ * @uses esc_url()
+ * @uses bp_get_root_domain()
+ * @uses bp_get_activity_root_slug()
+ * @uses bp_core_load_template()
+ * @uses apply_filters() To call the 'bp_activity_template_profile_activity_permalink' hook
+ */
 function bp_activity_screen_single_activity_permalink() {
     global $bp;
 …
 add_action( 'bp_screens', 'bp_activity_screen_single_activity_permalink' );
+/**
+ * Add activity notifications settings to the notifications settings page
+ *
+ * @since 1.2.0
+ *
+ * @global object $bp BuddyPress global settings
+ * @uses bp_get_user_meta()
+ * @uses bp_core_get_username()
+ * @uses do_action() To call the 'bp_activity_screen_notification_settings' hook
+ */
 function bp_activity_screen_notification_settings() {
     global $bp;

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

-                      r5019
+                      r5109
 <?php
 /**
  * BuddyPress Activity Template Functions
+ *
  * @package BuddyPress
  * @subpackage Activity Template
+ * @subpackage ActivityTemplate
  */
 …
  * Output the activity component slug
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.5
+ * @since 1.5.0
+ *
  * @uses bp_get_activity_slug()
 …
      * Return the activity component slug
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     * @since 1.5.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses apply_filters() To call the 'bp_get_activity_slug' hook
      */
     function bp_get_activity_slug() {
 …
  * Output the activity component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.5
+ * @since 1.5.0
+ *
  * @uses bp_get_activity_root_slug()
 …
      * Return the activity component root slug
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     * @since 1.5.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses apply_filters() To call the 'bp_get_activity_root_slug' hook
      */
     function bp_get_activity_root_slug() {
 …
  * Output member directory permalink
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.5
+ * @since 1.5.0
+ *
  * @uses bp_get_activity_directory_permalink()
  */
 …
      * Return member directory permalink
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     * @uses apply_filters()
+     * @since 1.5.0
+     *
      * @uses traisingslashit()
      * @uses bp_get_root_domain()
      * @uses bp_get_activity_root_slug()
+     * @return string
+     * @uses apply_filters() To call the 'bp_get_activity_directory_permalink' hook
+     *
+     * @return string Activity directory permalink
      */
     function bp_get_activity_directory_permalink() {
 …
  * This is responsible for loading a group of activity items and displaying them
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.5
+ * @since 1.0.0
  */
 class BP_Activity_Template {
 …
 /**
- * bp_has_activities()
+ *
  * Initializes the activity loop.
+ *
  * Based on the $args passed, bp_has_activities() populates the $activities_template global.
+ *
+ * @global BP_Activity_Template $activities_template
+ * @global object $bp Global BuddyPress settings object
+ * @param mixed $args Arguments for limiting the contents of the activity loop. Can be passed as an associative array or as a URL argument string
+ * @since 1.0.0
+ *
+ * @param array $args Arguments for limiting the contents of the activity loop. Can be passed as an associative array or as a URL argument string
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @global object $bp BuddyPress global settings
+ * @uses groups_is_user_member()
+ * @uses bp_current_action()
+ * @uses bp_is_current_action()
+ * @uses bp_get_activity_slug()
+ * @uses bp_action_variable()
+ * @uses wp_parse_args()
+ * @uses bp_is_active()
+ * @uses friends_get_friend_user_ids()
+ * @uses groups_get_user_groups()
+ * @uses bp_activity_get_user_favorites()
+ * @uses apply_filters() To call the 'bp_has_activities' hook
+ *
  * @return bool Returns true when activities are found
  */
 …
+}
+/**
+ * Determines if there are still activities left in the loop.
+ *
+ * @since 1.0.0
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @uses BP_Activity_Template::user_activities() {@link BP_Activity_Template::user_activities()}
+ *
+ * @return bool Returns true when activities are found
+ */
 function bp_activities() {
     global $activities_template;
 …
+}
+/**
+ * Gets the current activity object in the loop
+ *
+ * @since 1.0.0
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @uses BP_Activity_Template::the_activity() {@link BP_Activity_Template::the_activity()}
+ *
+ * @return object The current activity within the loop
+ */
 function bp_the_activity() {
     global $activities_template;
 …
+}
+/**
+ * Outputs the activity pagination count
+ *
+ * @since 1.0.0
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @uses BP_Activity_Template::the_activity() {@link BP_Activity_Template::the_activity()}
+ */
 function bp_activity_pagination_count() {
     echo bp_get_activity_pagination_count();
+}
+    /**
+     * Returns the activity pagination count
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses bp_core_number_format()
+     *
+     * @return string The pagination text
+     */
     function bp_get_activity_pagination_count() {
         global $bp, $activities_template;
 …
+    }
+/**
+ * Outputs the activity pagination links
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activity_pagination_links()
+ */
 function bp_activity_pagination_links() {
     echo bp_get_activity_pagination_links();
+}
+    /**
+     * Outputs the activity pagination links
+     *
+     * @since 1.0.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_pagination_links' hook
+     *
+     * @return string The pagination links
+     */
     function bp_get_activity_pagination_links() {
         global $activities_template;
 …
  * Returns true when there are more activity items to be shown than currently appear
+ *
+ * @package BuddyPress Activity
+ * @since 1.5
+ *
+ * @global $activities_template The activity data loop object created in bp_has_activities()
+ * @since 1.5.0
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @uses apply_filters() To call the 'bp_activity_has_more_items' hook
+ *
+ * @return bool $has_more_items True if more items, false if not
  */
 function bp_activity_has_more_items() {
 …
+}
+/**
+ * Outputs the activity count
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_count()
+ */
 function bp_activity_count() {
     echo bp_get_activity_count();
+}
+    /**
+     * Returns the activity count
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_count' hook
+     *
+     * @return int The activity count
+     */
     function bp_get_activity_count() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the number of activities per page
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_per_page()
+ */
 function bp_activity_per_page() {
     echo bp_get_activity_per_page();
+}
+    /**
+     * Returns the number of activities per page
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_per_page' hook
+     *
+     * @return int The activities per page
+     */
     function bp_get_activity_per_page() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activities title
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activities_title()
+ */
 function bp_activities_title() {
     global $bp_activity_title;
 …
     echo bp_get_activities_title();
+}
+    /**
+     * Returns the activities title
+     *
+     * @since 1.0.0
+     *
+     * @global string $bp_activity_title
+     * @uses apply_filters() To call the 'bp_get_activities_title' hook
+     *
+     * @return int The activities title
+     */
     function bp_get_activities_title() {
         global $bp_activity_title;
 …
+    }
+/**
+ * {@internal Missing Description}
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activities_no_activity()
+ */
 function bp_activities_no_activity() {
     global $bp_activity_no_activity;
 …
     echo bp_get_activities_no_activity();
+}
+    /**
+     * {@internal Missing Description}
+     *
+     * @since 1.0.0
+     *
+     * @global string $bp_activity_no_activity
+     * @uses apply_filters() To call the 'bp_get_activities_no_activity' hook
+     *
+     * @return unknown_type
+     */
     function bp_get_activities_no_activity() {
         global $bp_activity_no_activity;
 …
+    }
+/**
+ * Outputs the activity id
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_id()
+ */
 function bp_activity_id() {
     echo bp_get_activity_id();
+}
+    /**
+     * Returns the activity id
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_id' hook
+     *
+     * @return int The activity id
+     */
     function bp_get_activity_id() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity item id
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_item_id()
+ */
 function bp_activity_item_id() {
     echo bp_get_activity_item_id();
+}
+    /**
+     * Returns the activity item id
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_item_id' hook
+     *
+     * @return int The activity item id
+     */
     function bp_get_activity_item_id() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity secondary item id
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_secondary_item_id()
+ */
 function bp_activity_secondary_item_id() {
     echo bp_get_activity_secondary_item_id();
+}
+    /**
+     * Returns the activity secondary item id
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_secondary_item_id' hook
+     *
+     * @return int The activity secondary item id
+     */
     function bp_get_activity_secondary_item_id() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the date the activity was recorded
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_date_recorded()
+ */
 function bp_activity_date_recorded() {
     echo bp_get_activity_date_recorded();
+}
+    /**
+     * Returns the date the activity was recorded
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_date_recorded' hook
+     *
+     * @return string The date the activity was recorded
+     */
     function bp_get_activity_date_recorded() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity object name
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_object_name()
+ */
 function bp_activity_object_name() {
     echo bp_get_activity_object_name();
+}
+    /**
+     * Returns the activity object name
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_object_name' hook
+     *
+     * @return string The activity object name
+     */
     function bp_get_activity_object_name() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity type
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_type()
+ */
 function bp_activity_type() {
     echo bp_get_activity_type();
+}
+    /**
+     * Returns the activity type
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_type' hook
+     *
+     * @return string The activity type
+     */
     function bp_get_activity_type() {
         global $activities_template;
         return apply_filters( 'bp_get_activity_type', $activities_template->activity->type );
+    }
+    /**
+     * Outputs the activity action name
+     *
+     * Just a wrapper for bp_activity_type()
+     *
+     * @since 1.2.0
+     * @deprecated 1.5.0
+     *
+     * @todo Properly deprecate in favor of bp_activity_type() and
+     *       remove redundant echo
+     *
+     * @uses bp_activity_type()
+     */
     function bp_activity_action_name() { echo bp_activity_type(); }
+    /**
+     * Returns the activity type
+     *
+     * Just a wrapper for bp_get_activity_type()
+     *
+     * @since 1.2.0
+     * @deprecated 1.5.0
+     *
+     * @todo Properly deprecate in favor of bp_get_activity_type()
+     *
+     * @uses bp_get_activity_type()
+     *
+     * @return string The activity type
+     */
     function bp_get_activity_action_name() { return bp_get_activity_type(); }
+/**
+ * Outputs the activity user id
+ *
+ * @since 1.1.0
+ *
+ * @uses bp_get_activity_user_id()
+ */
 function bp_activity_user_id() {
     echo bp_get_activity_user_id();
+}
+    /**
+     * Returns the activity user id
+     *
+     * @since 1.1.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_user_id' hook
+     *
+     * @return int The activity user id
+     */
     function bp_get_activity_user_id() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity user link
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_user_link()
+ */
 function bp_activity_user_link() {
     echo bp_get_activity_user_link();
+}
+    /**
+     * Returns the activity user link
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses bp_core_get_user_domain()
+     * @uses apply_filters() To call the 'bp_get_activity_user_link' hook
+     *
+     * @return string $link The activity user link
+     */
     function bp_get_activity_user_link() {
         global $activities_template;
 …
 /**
- * bp_activity_avatar( $args )
+ *
  * Output the avatar of the user that performed the action
+ *
+ * @since 1.1.0
+ *
  * @param array $args
+ *
+ * @uses bp_get_activity_avatar()
  */
 function bp_activity_avatar( $args = '' ) {
 …
+}
     /**
-     * bp_get_activity_avatar( $args )
+     *
      * Return the avatar of the user that performed the action
+     *
      * @global array $bp
      * @global object $activities_template
+     * @since 1.1.0
+     *
      * @param array $args optional
+     * @return string
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @global object $bp BuddyPress global settings
+     * @uses bp_is_single_activity()
+     * @uses wp_parse_args()
+     * @uses apply_filters() To call the 'bp_get_activity_avatar_object_' . $current_activity_item->component hook
+     * @uses apply_filters() To call the 'bp_get_activity_avatar_item_id' hook
+     * @uses bp_core_fetch_avatar()
+     * @uses apply_filters() To call the 'bp_get_activity_avatar' hook
+     *
+     * @return string User avatar
      */
     function bp_get_activity_avatar( $args = '' ) {
 …
 /**
- * bp_activity_secondary_avatar( $args )
+ *
  * Output the avatar of the object that action was performed on
+ *
+ * @since 1.2.0
+ *
  * @param array $args optional
+ *
+ * @uses bp_get_activity_secondary_avatar()
  */
 function bp_activity_secondary_avatar( $args = '' ) {
     echo bp_get_activity_secondary_avatar( $args );
+}
+    /**
+     * bp_get_activity_secondary_avatar( $args )
+     *
+    /**
      * Return the avatar of the object that action was performed on
+     *
      * @global array $bp
      * @global object $activities_template
+     * @since 1.2.0
+     *
      * @param array $args optional
+     * @return string
+     *
+     * @global object $bp BuddyPress global settings
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses wp_parse_args()
+     * @uses get_blog_option()
+     * @uses apply_filters() To call the 'bp_get_activity_secondary_avatar_object_' . $activities_template->activity->component hook
+     * @uses apply_filters() To call the 'bp_get_activity_secondary_avatar_item_id' hook
+     * @uses bp_core_fetch_avatar()
+     * @uses apply_filters() To call the 'bp_get_activity_secondary_avatar' hook
+     *
+     * @return string The secondary avatar
      */
     function bp_get_activity_secondary_avatar( $args = '' ) {
 …
+    }
+/**
+ * Output the activity action
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_action()
+ */
 function bp_activity_action() {
     echo bp_get_activity_action();
+}
+    /**
+     * Return the activity action
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters_ref_array() To call the 'bp_get_activity_action_pre_meta' hook
+     * @uses bp_insert_activity_meta()
+     * @uses apply_filters_ref_array() To call the 'bp_get_activity_action' hook
+     *
+     * @return string The activity action
+     */
     function bp_get_activity_action() {
         global $activities_template;
 …
+    }
+/**
+ * Output the activity content body
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_content_body()
+ */
 function bp_activity_content_body() {
     echo bp_get_activity_content_body();
+}
+    /**
+     * Return the activity content body
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses bp_insert_activity_meta()
+     * @uses apply_filters_ref_array() To call the 'bp_get_activity_content_body' hook
+     *
+     * @return string The activity content body
+     */
     function bp_get_activity_content_body() {
         global $activities_template;
 …
+    }
+    function bp_activity_has_content() {
+        global $activities_template;
+        if ( !empty( $activities_template->activity->content ) )
+            return true;
+        return false;
+    }
+/**
+ * Does the activity have content?
+ *
+ * @since 1.2.0
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ *
+ * @return bool True if activity has content, false otherwise
+ */
+function bp_activity_has_content() {
+    global $activities_template;
+    if ( !empty( $activities_template->activity->content ) )
+        return true;
+    return false;
+}
+/**
+ * Output the activity content
+ *
+ * @since 1.0.0
+ * @deprecated 1.5.0
+ *
+ * @todo properly deprecate this function
+ *
+ * @uses bp_get_activity_content()
+ */
 function bp_activity_content() {
     echo bp_get_activity_content();
+}
+    /**
+     * Return the activity content
+     *
+     * @since 1.0.0
+     * @deprecated 1.5.0
+     *
+     * @todo properly deprecate this function
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses bp_get_activity_action()
+     * @uses bp_get_activity_content_body()
+     * @uses apply_filters() To call the 'bp_get_activity_content' hook
+     *
+     * @return string The activity content
+     */
     function bp_get_activity_content() {
         global $activities_template;
         /***
+        /**
          * If you want to filter activity update content, please use
          * the filter 'bp_get_activity_content_body'
 …
+    }
+    function bp_insert_activity_meta( $content ) {
+        global $activities_template, $bp;
+        // Strip any legacy time since placeholders from BP 1.0-1.1
+        $content = str_replace( '<span class="time-since">%s</span>', '', $content );
+        // Insert the time since.
+        $time_since = apply_filters_ref_array( 'bp_activity_time_since', array( '<span class="time-since">' . bp_core_time_since( $activities_template->activity->date_recorded ) . '</span>', &$activities_template->activity ) );
+        // Insert the permalink
+        if ( !bp_is_single_activity() )
+            $content = apply_filters_ref_array( 'bp_activity_permalink', array( sprintf( '%1$s <a href="%2$s" class="view activity-time-since" title="%3$s">%4$s</a>', $content, bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ), esc_attr__( 'View Discussion', 'buddypress' ), $time_since ), &$activities_template->activity ) );
+        else
+            $content .= str_pad( $time_since, strlen( $time_since ) + 2, ' ', STR_PAD_BOTH );
+        return apply_filters( 'bp_insert_activity_meta', $content );
+    }
+/**
+ * Insert activity meta
+ *
+ * @since 1.2.0
+ *
+ * @param string $content
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @global object $bp BuddyPress global settings
+ * @uses bp_core_time_since()
+ * @uses apply_filters_ref_array() To call the 'bp_activity_time_since' hook
+ * @uses bp_is_single_activity()
+ * @uses bp_activity_get_permalink()
+ * @uses esc_attr__()
+ * @uses apply_filters_ref_array() To call the 'bp_activity_permalink' hook
+ * @uses apply_filters() To call the 'bp_insert_activity_meta' hook
+ *
+ * @return string The activity content
+ */
+function bp_insert_activity_meta( $content ) {
+    global $activities_template, $bp;
+    // Strip any legacy time since placeholders from BP 1.0-1.1
+    $content = str_replace( '<span class="time-since">%s</span>', '', $content );
+    // Insert the time since.
+    $time_since = apply_filters_ref_array( 'bp_activity_time_since', array( '<span class="time-since">' . bp_core_time_since( $activities_template->activity->date_recorded ) . '</span>', &$activities_template->activity ) );
+    // Insert the permalink
+    if ( !bp_is_single_activity() )
+        $content = apply_filters_ref_array( 'bp_activity_permalink', array( sprintf( '%1$s <a href="%2$s" class="view activity-time-since" title="%3$s">%4$s</a>', $content, bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ), esc_attr__( 'View Discussion', 'buddypress' ), $time_since ), &$activities_template->activity ) );
+    else
+        $content .= str_pad( $time_since, strlen( $time_since ) + 2, ' ', STR_PAD_BOTH );
+    return apply_filters( 'bp_insert_activity_meta', $content );
+}
+/**
+ * Determine if the current user can delete an activity item
+ *
+ * @since 1.2.0
+ *
+ * @param object $activity Optional
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @global object $bp BuddyPress global settings
+ * @uses apply_filters() To call the 'bp_activity_user_can_delete' hook
+ *
+ * @return bool True if can delete, false otherwise
+ */
 function bp_activity_user_can_delete( $activity = false ) {
     global $activities_template, $bp;
 …
+}
+/**
+ * Output the activity parent content
+ *
+ * @since 1.2.0
+ *
+ * @param array $args Optional
+ *
+ * @uses bp_get_activity_parent_content()
+ */
 function bp_activity_parent_content( $args = '' ) {
     echo bp_get_activity_parent_content($args);
+}
+    /**
+     * Return the activity content
+     *
+     * @since 1.2.0
+     *
+     * @param array $args Optional
+     *
+     * @global object $bp BuddyPress global settings
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses wp_parse_args()
+     * @uses apply_filters() To call the 'bp_get_activity_parent_content' hook
+     *
+     * @return mixed False on failure, otherwise the activity parent content
+     */
     function bp_get_activity_parent_content( $args = '' ) {
         global $bp, $activities_template;
 …
+    }
+/**
+ * Output whether or not the current activity is in a current user's favorites
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_is_favorite()
+ */
 function bp_activity_is_favorite() {
     echo bp_get_activity_is_favorite();
+}
+    /**
+     * Return whether or not the current activity is in a current user's favorites
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_is_favorite' hook
+     *
+     * @return bool True if user favorite, false otherwise
+     */
     function bp_get_activity_is_favorite() {
         global $bp, $activities_template;
 …
  * Echoes the comment markup for an activity item
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ *
+ * @param str $args Unused
+ * @since 1.2.0
+ *
+ * @todo deprecate $args param
+ *
+ * @param string $args Unused. Appears to be left over from an earlier implementation.
  */
 function bp_activity_comments( $args = '' ) {
     echo bp_activity_get_comments( $args );
+}
     /**
      * Gets the comment markup for an activity item
+     *
      * @package BuddyPress
      * @subpackage Activity Template
+     *
      * @param str $args Unused. Appears to be left over from an earlier implementation.
+     * @since 1.2.0
+     *
+     * @todo deprecate $args param
+     *
      * @todo Given that checks for children already happen in bp_activity_recurse_comments(),
      *    this function can probably be streamlined or removed.
+     *
+     * @param string $args Unused. Appears to be left over from an earlier implementation.
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @global object $bp BuddyPress global settings
+     * @uses bp_activity_recurse_comments()
      */
     function bp_activity_get_comments( $args = '' ) {
 …
          * split between here and the comment.php template.
+         *
+         * @package BuddyPress
+         * @subpackage Activity Template
+         * @since 1.2.0
+         *
+         * @param obj $comment The activity object currently being recursed
+         * @todo remove $counter global
+         *
+         * @param object $comment The activity object currently being recursed
+         *
+         * @global object $activities_template {@link BP_Activity_Template}
+         * @global object $bp BuddyPress global settings
+         * @uses locate_template()
          */
         function bp_activity_recurse_comments( $comment ) {
 …
  * Utility function that returns the comment currently being recursed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.5
+ *
+ * @return obj $current_comment The activity comment currently being displayed
+ * @since 1.5.0
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @uses apply_filters() To call the 'bp_activity_current_comment' hook
+ *
+ * @return object|bool $current_comment The activity comment currently being displayed. False on failure
  */
 function bp_activity_current_comment() {
 …
  * Echoes the id of the activity comment currently being displayed
+ *
  * @package BuddyPress
  * @subpackage Activity Template
  * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_get_activity_comment_id()
  */
 function bp_activity_comment_id() {
     echo bp_get_activity_comment_id();
+}
     /**
      * Gets the id of the activity comment currently being displayed
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     * @since 1.5.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_activity_comment_id' hook
+     *
      * @return int $comment_id The id of the activity comment currently being displayed
 …
  * Echoes the user_id of the author of the activity comment currently being displayed
+ *
  * @package BuddyPress
  * @subpackage Activity Template
  * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_get_activity_comment_user_id()
  */
 function bp_activity_comment_user_id() {
     echo bp_get_activity_comment_user_id();
+}
     /**
      * Gets the user_id of the author of the activity comment currently being displayed
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     *
+     * @return int $user_id The user_id of the author of the displayed activity comment
+     * @since 1.5.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_activity_comment_user_id' hook
+     *
+     * @return int|bool $user_id The user_id of the author of the displayed activity comment. False on failure
      */
     function bp_get_activity_comment_user_id() {
 …
  * Echoes the author link for the activity comment currently being displayed
+ *
  * @package BuddyPress
  * @subpackage Activity Template
  * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_get_activity_comment_user_link()
  */
 function bp_activity_comment_user_link() {
     echo bp_get_activity_comment_user_link();
+}
     /**
      * Gets the author link for the activity comment currently being displayed
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     *
+     * @return str $user_link The URL of the activity comment author's profile
+     * @since 1.5.0
+     *
+     * @uses bp_core_get_user_domain()
+     * @uses bp_get_activity_comment_user_id()
+     * @uses apply_filters() To call the 'bp_activity_comment_user_link' hook
+     *
+     * @return string $user_link The URL of the activity comment author's profile
      */
     function bp_get_activity_comment_user_link() {
 …
  * Echoes the author name for the activity comment currently being displayed
+ *
  * @package BuddyPress
  * @subpackage Activity Template
  * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_get_activity_comment_name()
  */
 function bp_activity_comment_name() {
     echo bp_get_activity_comment_name();
+}
     /**
      * Gets the author name for the activity comment currently being displayed
 …
      * The use of the bp_acomment_name filter is deprecated. Please use bp_activity_comment_name
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     *
+     * @return str $name The full name of the activity comment author
+     * @since 1.5.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_acomment_name' hook
+     * @uses apply_filters() To call the 'bp_activity_comment_name' hook
+     *
+     * @return string $name The full name of the activity comment author
      */
     function bp_get_activity_comment_name() {
 …
  * Echoes the date_recorded of the activity comment currently being displayed
+ *
  * @package BuddyPress
  * @subpackage Activity Template
  * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_get_activity_comment_date_recorded()
  */
 function bp_activity_comment_date_recorded() {
     echo bp_get_activity_comment_date_recorded();
+}
     /**
      * Gets the date_recorded for the activity comment currently being displayed
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     *
+     * @return str $date_recorded Time since the activity was recorded, of the form "%s ago"
+     * @since 1.5.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses bp_core_time_since()
+     * @uses apply_filters() To call the 'bp_activity_comment_date_recorded' hook
+     *
+     * @return string|bool $date_recorded Time since the activity was recorded, of the form "%s ago". False on failure
      */
     function bp_get_activity_comment_date_recorded() {
 …
  * Echoes the 'delete' URL for the activity comment currently being displayed
+ *
  * @package BuddyPress
  * @subpackage Activity Template
  * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_get_activity_comment_delete_link()
  */
 function bp_activity_comment_delete_link() {
     echo bp_get_activity_comment_delete_link();
+}
     /**
      * Gets the 'delete' URL for the activity comment currently being displayed
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     *
+     * @return str $link The nonced URL for deleting the current activity comment
+     * @since 1.5.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses wp_nonce_url()
+     * @uses bp_get_root_domain()
+     * @uses bp_get_activity_slug()
+     * @uses bp_get_activity_comment_id()
+     * @uses apply_filters() To call the 'bp_activity_comment_delete_link' hook
+     *
+     * @return string $link The nonced URL for deleting the current activity comment
      */
     function bp_get_activity_comment_delete_link() {
 …
  * Echoes the content of the activity comment currently being displayed
+ *
  * @package BuddyPress
  * @subpackage Activity Template
  * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bp_get_activity_comment_content()
  */
 function bp_activity_comment_content() {
     echo bp_get_activity_comment_content();
+}
     /**
      * Gets the content of the activity comment currently being displayed
 …
      * content of activity comments only.
+     *
+     * @package BuddyPress
+     * @subpackage Activity Template
+     * @since 1.5
+     *
+     * @return str $content The content of the current activity comment
+     * @since 1.5.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_content' hook
+     * @uses apply_filters() To call the 'bp_activity_comment_content' hook
+     *
+     * @return string $content The content of the current activity comment
      */
     function bp_get_activity_comment_content() {
 …
+    }
+/**
+ * Echoes the activity comment count
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_activity_get_comment_count()
+ */
 function bp_activity_comment_count() {
     echo bp_activity_get_comment_count();
+}
+    /**
+     * Gets the content of the activity comment currently being displayed
+     *
+     * The content is run through two filters. bp_get_activity_content will apply all filters
+     * applied to activity items in general. Use bp_activity_comment_content to modify the
+     * content of activity comments only.
+     *
+     * @since 1.2.0
+     *
+     * @todo deprecate $args
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @global object $bp BuddyPress global settings
+     * @uses bp_activity_recurse_comment_count()
+     * @uses apply_filters() To call the 'bp_activity_get_comment_count' hook
+     *
+     * @return int $count The activity comment count. Defaults to zero
+     */
     function bp_activity_get_comment_count( $args = '' ) {
         global $activities_template, $bp;
 …
         return apply_filters( 'bp_activity_get_comment_count', (int)$count );
+    }
+        /**
+         * Gets the content of the activity comment currently being displayed
+         *
+         * The content is run through two filters. bp_get_activity_content will apply all filters
+         * applied to activity items in general. Use bp_activity_comment_content to modify the
+         * content of activity comments only.
+         *
+         * @since 1.2.0
+         *
+         * @todo investigate why bp_activity_recurse_comment_count() is used while being declared
+         *
+         * @param object $comment Activity comments object
+         *
+         * @global object $activities_template {@link BP_Activity_Template}
+         * @global object $bp BuddyPress global settings
+         * @uses bp_activity_recurse_comment_count()
+         * @uses apply_filters() To call the 'bp_activity_get_comment_count' hook
+         *
+         * @return int $count The activity comment count.
+         */
         function bp_activity_recurse_comment_count( $comment, $count = 0 ) {
             global $activities_template, $bp;
 …
+        }
+/**
+ * Echoes the activity comment link
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_comment_link()
+ */
 function bp_activity_comment_link() {
     echo bp_get_activity_comment_link();
+}
+    /**
+     * Gets the activity comment link
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_comment_link' hook
+     *
+     * @return string The activity comment link
+     */
     function bp_get_activity_comment_link() {
         global $activities_template;
 …
+    }
+/**
+ * Echoes the activity comment form no javascript display CSS
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_comment_form_nojs_display()
+ */
 function bp_activity_comment_form_nojs_display() {
     echo bp_get_activity_comment_form_nojs_display();
+}
+    /**
+     * Gets the activity comment form no javascript display CSS
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     *
+     * @return string|bool The activity comment form no javascript display CSS. False on failure
+     */
     function bp_get_activity_comment_form_nojs_display() {
         global $activities_template;
 …
+    }
+/**
+ * Echoes the activity comment form action
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_comment_form_action()
+ */
 function bp_activity_comment_form_action() {
     echo bp_get_activity_comment_form_action();
+}
+    /**
+     * Gets the activity comment form action
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses home_url()
+     * @uses bp_get_activity_root_slug()
+     * @uses apply_filters() To call the 'bp_get_activity_comment_form_action' hook
+     *
+     * @return string The activity comment form action
+     */
     function bp_get_activity_comment_form_action() {
         global $bp;
 …
+    }
+/**
+ * Echoes the activity permalink id
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_permalink_id()
+ */
 function bp_activity_permalink_id() {
     echo bp_get_activity_permalink_id();
+}
+    /**
+     * Gets the activity permalink id
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses apply_filters() To call the 'bp_get_activity_permalink_id' hook
+     *
+     * @return string The activity permalink id
+     */
     function bp_get_activity_permalink_id() {
         global $bp;
 …
+    }
+/**
+ * Echoes the activity thread permalink
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_permalink_id()
+ */
 function bp_activity_thread_permalink() {
     echo bp_get_activity_thread_permalink();
+}
+    /**
+     * Gets the activity thread permalink
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses bp_activity_get_permalink()
+     * @uses apply_filters() To call the 'bp_get_activity_thread_permalink' hook
+     *
+     * @return string $link The activity thread permalink
+     */
     function bp_get_activity_thread_permalink() {
         global $bp, $activities_template;
 …
+    }
+/**
+ * Echoes the activity favorite link
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_favorite_link()
+ */
 function bp_activity_favorite_link() {
     echo bp_get_activity_favorite_link();
+}
+    /**
+     * Gets the activity favorite link
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses wp_nonce_url()
+     * @uses home_url()
+     * @uses bp_get_activity_root_slug()
+     * @uses apply_filters() To call the 'bp_get_activity_favorite_link' hook
+     *
+     * @return string The activity favorite link
+     */
     function bp_get_activity_favorite_link() {
         global $bp, $activities_template;
 …
+    }
+/**
+ * Echoes the activity unfavorite link
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_unfavorite_link()
+ */
 function bp_activity_unfavorite_link() {
     echo bp_get_activity_unfavorite_link();
+}
+    /**
+     * Gets the activity unfavorite link
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses wp_nonce_url()
+     * @uses home_url()
+     * @uses bp_get_activity_root_slug()
+     * @uses apply_filters() To call the 'bp_get_activity_unfavorite_link' hook
+     *
+     * @return string The activity unfavorite link
+     */
     function bp_get_activity_unfavorite_link() {
         global $bp, $activities_template;
 …
+    }
+/**
+ * Echoes the activity CSS class
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activity_css_class()
+ */
 function bp_activity_css_class() {
     echo bp_get_activity_css_class();
+}
+    /**
+     * Gets the activity CSS class
+     *
+     * @since 1.0.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_activity_mini_activity_types' hook
+     * @uses bp_activity_get_comment_count()
+     * @uses bp_activity_can_comment()
+     * @uses apply_filters() To call the 'bp_get_activity_css_class' hook
+     *
+     * @return string The activity css class
+     */
     function bp_get_activity_css_class() {
         global $activities_template;
 …
 /**
- * bp_activity_delete_link()
+ *
  * Display the activity delete link.
+ *
+ * @since 1.1
+ * @since 1.1.0
+ *
  * @uses bp_get_activity_delete_link()
  */
 …
     /**
-     * bp_get_activity_delete_link()
+     *
      * Return the activity delete link.
+     *
+     * @global object $activities_template BuddyPress Activities Template
+     * @since 1.1.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
      * @global object $bp BuddyPress global settings
+     * @uses bp_get_root_domain()
+     * @uses bp_get_activity_root_slug()
+     * @uses bp_is_activity_component()
+     * @uses bp_current_action()
+     * @uses add_query_arg()
+     * @uses wp_get_referer()
+     * @uses wp_nonce_url()
+     * @uses apply_filters() To call the 'bp_get_activity_delete_link' hook
+     *
      * @return string $link Activity delete link. Contains $redirect_to arg if on single activity page.
-     * @since 1.1
      */
     function bp_get_activity_delete_link() {
 …
+    }
+/**
+ * Display the activity latest update link.
+ *
+ * @since 1.2.0
+ *
+ * @param int $user_id Defaults to 0
+ *
+ * @uses bp_get_activity_latest_update()
+ */
 function bp_activity_latest_update( $user_id = 0 ) {
     echo bp_get_activity_latest_update( $user_id );
+}
+    /**
+     * Return the activity latest update link.
+     *
+     * @since 1.2.0
+     *
+     * @param int $user_id Defaults to 0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses bp_core_is_user_spammer()
+     * @uses bp_core_is_user_deleted()
+     * @uses bp_get_user_meta()
+     * @uses apply_filters() To call the 'bp_get_activity_latest_update_excerpt' hook
+     * @uses bp_create_excerpt()
+     * @uses bp_get_root_domain()
+     * @uses bp_get_activity_root_slug()
+     * @uses apply_filters() To call the 'bp_get_activity_latest_update' hook
+     *
+     * @return string|bool $latest_update The activity latest update link. False on failure
+     */
     function bp_get_activity_latest_update( $user_id = 0 ) {
         global $bp;
 …
+    }
+/**
+ * Display the activity filter links.
+ *
+ * @since 1.1.0
+ *
+ * @param array $args Defaults to false
+ *
+ * @uses bp_get_activity_filter_links()
+ */
 function bp_activity_filter_links( $args = false ) {
     echo bp_get_activity_filter_links( $args );
+}
+    /**
+     * Return the activity filter links.
+     *
+     * @since 1.1.0
+     *
+     * @param array $args Defaults to false
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @global object $bp BuddyPress global settings
+     * @uses wp_parse_args()
+     * @uses BP_Activity_Activity::get_recorded_components() {@link BP_Activity_Activity}
+     * @uses esc_attr()
+     * @uses add_query_arg()
+     * @uses remove_query_arg()
+     * @uses apply_filters() To call the 'bp_get_activity_filter_link_href' hook
+     * @uses apply_filters() To call the 'bp_get_activity_filter_links' hook
+     *
+     * @return string|bool $component_links The activity filter links. False on failure
+     */
     function bp_get_activity_filter_links( $args = false ) {
         global $activities_template, $bp;
 …
+    }
+/**
+ * Determine if a comment can be made on an activity item
+ *
+ * @since 1.2.0
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ * @global object $bp BuddyPress global settings
+ * @uses bp_get_activity_action_name()
+ * @uses apply_filters() To call the 'bp_activity_can_comment' hook
+ *
+ * @return bool $can_comment Defaults to true
+ */
 function bp_activity_can_comment() {
     global $activities_template, $bp;
 …
+}
+/**
+ * Determine if a comment can be made on an activity reply item
+ *
+ * @since 1.5.0
+ *
+ * @param object $comment Activity comment
+ *
+ * @uses apply_filters() To call the 'bp_activity_can_comment_reply' hook
+ *
+ * @return bool $can_comment Defaults to true
+ */
 function bp_activity_can_comment_reply( $comment ) {
     $can_comment = true;
 …
+}
+/**
+ * Determine if an favorites are allowed
+ *
+ * @since 1.5.0
+ *
+ * @uses apply_filters() To call the 'bp_activity_can_favorite' hook
+ *
+ * @return bool $can_favorite Defaults to true
+ */
 function bp_activity_can_favorite() {
     $can_favorite = true;
 …
+}
+/**
+ * Echoes the total favorite count for a specified user
+ *
+ * @since 1.2.0
+ *
+ * @param int $user_id Defaults to 0
+ *
+ * @uses bp_get_total_favorite_count_for_user()
+ */
 function bp_total_favorite_count_for_user( $user_id = 0 ) {
     echo bp_get_total_favorite_count_for_user( $user_id );
+}
+    /**
+     * Returns the total favorite count for a specified user
+     *
+     * @since 1.2.0
+     *
+     * @param int $user_id Defaults to 0
+     *
+     * @uses bp_activity_total_favorites_for_user()
+     * @uses apply_filters() To call the 'bp_get_total_favorite_count_for_user' hook
+     *
+     * @return int The total favorite count for a specified user
+     */
     function bp_get_total_favorite_count_for_user( $user_id = 0 ) {
         return apply_filters( 'bp_get_total_favorite_count_for_user', bp_activity_total_favorites_for_user( $user_id ) );
+    }
+/**
+ * Echoes the total mention count for a specified user
+ *
+ * @since 1.2.0
+ *
+ * @param int $user_id Defaults to 0
+ *
+ * @uses bp_get_total_favorite_count_for_user()
+ */
 function bp_total_mention_count_for_user( $user_id = 0 ) {
     echo bp_get_total_favorite_count_for_user( $user_id );
+}
+    /**
+     * Returns the total mention count for a specified user
+     *
+     * @since 1.2.0
+     *
+     * @todo remove unnecessary $bp global
+     *
+     * @param int $user_id Defaults to 0
+     *
+     * @uses bp_get_user_meta()
+     * @uses apply_filters() To call the 'bp_get_total_mention_count_for_user' hook
+     *
+     * @return int The total mention count for a specified user
+     */
     function bp_get_total_mention_count_for_user( $user_id = 0 ) {
         global $bp;
 …
+    }
+/**
+ * Echoes the public message link for displayed user
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_send_public_message_link()
+ */
 function bp_send_public_message_link() {
     echo bp_get_send_public_message_link();
+}
+    /**
+     * Returns the public message link for displayed user
+     *
+     * @since 1.2.0
+     *
+     * @global object $bp BuddyPress global settings
+     * @uses bp_is_my_profile()
+     * @uses is_user_logged_in()
+     * @uses wp_nonce_url()
+     * @uses bp_loggedin_user_domain()
+     * @uses bp_get_activity_slug()
+     * @uses bp_core_get_username()
+     * @uses apply_filters() To call the 'bp_get_send_public_message_link' hook
+     *
+     * @return string The public message link for displayed user
+     */
     function bp_get_send_public_message_link() {
         global $bp;
 …
+    }
+/**
+ * Echoes the mentioned user display name
+ *
+ * @since 1.2.0
+ *
+ * @param int|string User id or username
+ *
+ * @uses bp_get_mentioned_user_display_name()
+ */
 function bp_mentioned_user_display_name( $user_id_or_username ) {
     echo bp_get_mentioned_user_display_name( $user_id_or_username );
+}
+    /**
+     * Returns the mentioned user display name
+     *
+     * @since 1.2.0
+     *
+     * @param int|string User id or username
+     *
+     * @uses bp_core_get_user_displayname()
+     * @uses apply_filters() To call the 'bp_get_mentioned_user_display_name' hook
+     *
+     * @return string The mentioned user display name
+     */
     function bp_get_mentioned_user_display_name( $user_id_or_username ) {
         if ( !$name = bp_core_get_user_displayname( $user_id_or_username ) )
 …
 /**
- * bp_send_public_message_button( $args )
+ *
  * Output button for sending a public message
+ *
+ * @param array $args
+ * @since 1.2.0
+ *
+ * @param array $args Optional
+ *
+ * @uses bp_get_send_public_message_button()
  */
 function bp_send_public_message_button( $args = '' ) {
     echo bp_get_send_public_message_button( $args );
+}
+    /**
+     * bp_get_send_public_message_button( $args )
+     *
+    /**
      * Return button for sending a public message
+     *
+     * @param array $args
+     * @return string
+     * @since 1.2.0
+     *
+     * @param array $args Optional
+     *
+     * @uses bp_get_send_public_message_link()
+     * @uses wp_parse_args()
+     * @uses bp_get_button()
+     * @uses apply_filters() To call the 'bp_get_send_public_message_button' hook
+     *
+     * @return string The button for sending a public message
      */
     function bp_get_send_public_message_button( $args = '' ) {
 …
+    }
+/**
+ * Outputs the activity post form action
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_activity_post_form_action()
+ */
 function bp_activity_post_form_action() {
     echo bp_get_activity_post_form_action();
+}
+    /**
+     * Returns the activity post form action
+     *
+     * @since 1.2.0
+     *
+     * @uses home_url()
+     * @uses bp_get_activity_root_slug()
+     * @uses apply_filters() To call the 'bp_get_activity_post_form_action' hook
+     *
+     * @return string The activity post form action
+     */
     function bp_get_activity_post_form_action() {
         return apply_filters( 'bp_get_activity_post_form_action', home_url( bp_get_activity_root_slug() . '/post/' ) );
+    }
+/* RSS Feed Template Tags ***************************/
+/* RSS Feed Template Tags ****************************************************/
+/**
+ * Outputs the sitewide activity feed link
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_sitewide_activity_feed_link()
+ */
 function bp_sitewide_activity_feed_link() {
     echo bp_get_sitewide_activity_feed_link();
+}
+    /**
+     * Returns the sitewide activity feed link
+     *
+     * @since 1.0.0
+     *
+     * @uses home_url()
+     * @uses bp_get_activity_root_slug()
+     * @uses apply_filters() To call the 'bp_get_sitewide_activity_feed_link' hook
+     *
+     * @return string The sitewide activity feed link
+     */
     function bp_get_sitewide_activity_feed_link() {
         return apply_filters( 'bp_get_sitewide_activity_feed_link', home_url( bp_get_activity_root_slug() . '/feed/' ) );
+    }
+/**
+ * Outputs the member activity feed link
+ *
+ * @since 1.2.0
+ *
+ * @uses bp_get_member_activity_feed_link()
+ */
 function bp_member_activity_feed_link() {
     echo bp_get_member_activity_feed_link();
+}
+function bp_activities_member_rss_link() {
+    echo bp_get_member_activity_feed_link();
+}
+/**
+ * Outputs the member activity feed link
+ *
+ * @since 1.0.0
+ * @deprecated 1.2.0
+ *
+ * @todo properly deprecated in favor of bp_member_activity_feed_link()
+ *
+ * @uses bp_get_member_activity_feed_link()
+ */
+function bp_activities_member_rss_link() { echo bp_get_member_activity_feed_link(); }
+    /**
+     * Returns the member activity feed link
+     *
+     * @since 1.2.0
+     *
+     * @uses bp_is_profile_component()
+     * @uses bp_is_current_action()
+     * @uses bp_displayed_user_domain()
+     * @uses bp_get_activity_slug()
+     * @uses bp_is_active()
+     * @uses bp_get_friends_slug()
+     * @uses bp_get_groups_slug()
+     * @uses apply_filters() To call the 'bp_get_activities_member_rss_link' hook
+     *
+     * @return string $link The member activity feed link
+     */
     function bp_get_member_activity_feed_link() {
         global $bp;
 …
         return apply_filters( 'bp_get_activities_member_rss_link', $link );
+    }
+    /**
+     * Returns the member activity feed link
+     *
+     * @since 1.0.0
+     * @deprecated 1.2.0
+     *
+     * @todo properly deprecated in favor of bp_get_member_activity_feed_link()
+     *
+     * @uses bp_get_member_activity_feed_link()
+     *
+     * @return string The member activity feed link
+     */
     function bp_get_activities_member_rss_link() { return bp_get_member_activity_feed_link(); }
+/** Template tags for RSS feed output *****************************************/
+/** Template tags for RSS feed output ****************************************/
+/**
+ * Outputs the activity feed item guid
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_activity_feed_item_guid()
+ */
 function bp_activity_feed_item_guid() {
     echo bp_get_activity_feed_item_guid();
+}
+    /**
+     * Returns the activity feed item guid
+     *
+     * @since 1.2.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_feed_item_guid' hook
+     *
+     * @return string The activity feed item guid
+     */
     function bp_get_activity_feed_item_guid() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity feed item title
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activity_feed_item_title()
+ */
 function bp_activity_feed_item_title() {
     echo bp_get_activity_feed_item_title();
+}
+    /**
+     * Returns the activity feed item title
+     *
+     * @since 1.0.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses ent2ncr()
+     * @uses convert_chars()
+     * @uses bp_create_excerpt()
+     * @uses apply_filters() To call the 'bp_get_activity_feed_item_title' hook
+     *
+     * @return string $title The activity feed item title
+     */
     function bp_get_activity_feed_item_title() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity feed item link
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activity_feed_item_link()
+ */
 function bp_activity_feed_item_link() {
     echo bp_get_activity_feed_item_link();
+}
+    /**
+     * Returns the activity feed item link
+     *
+     * @since 1.0.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_feed_item_link' hook
+     *
+     * @return string The activity feed item link
+     */
     function bp_get_activity_feed_item_link() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity feed item date
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activity_feed_item_date()
+ */
 function bp_activity_feed_item_date() {
     echo bp_get_activity_feed_item_date();
+}
+    /**
+     * Returns the activity feed item date
+     *
+     * @since 1.0.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses apply_filters() To call the 'bp_get_activity_feed_item_date' hook
+     *
+     * @return string The activity feed item date
+     */
     function bp_get_activity_feed_item_date() {
         global $activities_template;
 …
+    }
+/**
+ * Outputs the activity feed item description
+ *
+ * @since 1.0.0
+ *
+ * @uses bp_get_activity_feed_item_description()
+ */
 function bp_activity_feed_item_description() {
     echo bp_get_activity_feed_item_description();
+}
+    /**
+     * Returns the activity feed item description
+     *
+     * @since 1.0.0
+     *
+     * @global object $activities_template {@link BP_Activity_Template}
+     * @uses ent2ncr()
+     * @uses convert_chars()
+     * @uses apply_filters() To call the 'bp_get_activity_feed_item_description' hook
+     *
+     * @return string The activity feed item description
+     */
     function bp_get_activity_feed_item_description() {
         global $activities_template;
 …
  * Template tag so we can hook activity feed to <head>
+ *
+ * @since 1.5
+ * @since 1.5.0
+ *
+ * @uses bloginfo()
+ * @uses bp_sitewide_activity_feed_link()
  */
 function bp_activity_sitewide_feed() {

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

-                      r4817
+                      r5109
 <?php
 /**
  * RSS2 Feed Template for displaying a member's favorite activity
+ *
  * @package BuddyPress
+ * @subpackage ActivityFeeds
  */

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

-                      r5065
+                      r5109
 <?php
 /**
  * RSS2 Feed Template for displaying a member's friends activity stream.
+ *
  * @package BuddyPress
+ * @subpackage ActivityFeeds
  */

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

-                      r4817
+                      r5109
 <?php
 /**
  * RSS2 Feed Template for displaying a group activity stream
+ *
  * @package BuddyPress
+ * @subpackage ActivityFeeds
  */

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

-                      r4817
+                      r5109
 <?php
 /**
  * RSS2 Feed Template for displaying a member's group's activity
+ *
  * @package BuddyPress
+ * @subpackage ActivityFeeds
  */

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

-                      r4817
+                      r5109
 <?php
 /**
  * RSS2 Feed Template for displaying a member's group's activity
+ *
  * @package BuddyPress
+ * @subpackage ActivityFeeds
  */

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

-                      r4817
+                      r5109
 <?php
 /**
  * RSS2 Feed Template for displaying a member's activity stream.
+ *
  * @package BuddyPress
+ * @subpackage ActivityFeeds
  */

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

-                      r4817
+                      r5109
 <?php
 /**
  * RSS2 Feed Template for displaying the site wide activity stream.
+ *
  * @package BuddyPress
+ * @subpackage ActivityFeeds
  */

BuddyPress.org

Context Navigation

Legend:

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

trunk/bp-activity/bp-activity-classes.php

trunk/bp-activity/bp-activity-filters.php

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

trunk/bp-activity/bp-activity-loader.php

trunk/bp-activity/bp-activity-notifications.php

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

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

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

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

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

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

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

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

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

Download in other formats: