Changeset 10077

Timestamp:

08/31/2015 06:51:35 AM (11 years ago)

Author:

tw2113

Message:

Standardizing our @since tags for the Activity component.

See #6576.

Location:

trunk/src/bp-activity

Files:

• bp-activity-actions.php (modified) (32 diffs)
• bp-activity-admin.php (modified) (57 diffs)
• bp-activity-akismet.php (modified) (32 diffs)
• bp-activity-cache.php (modified) (3 diffs)
• bp-activity-classes.php (modified) (1 diff)
• bp-activity-cssjs.php (modified) (4 diffs)
• bp-activity-filters.php (modified) (28 diffs)
• bp-activity-functions.php (modified) (114 diffs)
• bp-activity-loader.php (modified) (10 diffs)
• bp-activity-notifications.php (modified) (24 diffs)
• bp-activity-screens.php (modified) (37 diffs)
• bp-activity-template.php (modified) (260 diffs)
• classes/class-bp-activity-activity.php (modified) (35 diffs)
• classes/class-bp-activity-feed.php (modified) (12 diffs)
• classes/class-bp-activity-query.php (modified) (10 diffs)

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

@@ -1 +1 @@
 <?php
-
 /**
  * Action functions are exactly the same as screen functions, however they do
@@ -16 +15 @@
  * Allow core components and dependent plugins to register activity actions.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses do_action() To call 'bp_register_activity_actions' hook.
@@ -25 +24 @@
          * Fires on bp_init to allow core components and dependent plugins to register activity actions.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          */
         do_action( 'bp_register_activity_actions' );
@@ -34 +33 @@
  * Catch and route requests for single activity item permalinks.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_is_activity_component()
@@ -105 +104 @@
          * Filter the intended redirect url before the redirect occurs for the single activity item.
          *
-         * @since BuddyPress (1.2.2)
+         * @since 1.2.2
          *
          * @param array Array with url to redirect to and activity related to the redirect.
@@ -121 +120 @@
  * Delete specific activity item and redirect to previous page.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @param int $activity_id Activity id to be deleted. Defaults to 0.
@@ -164 +163 @@
          * Fires before the deletion so plugins can still fetch information about it.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param int $activity_id The activity ID.
@@ -180 +179 @@
          * Fires after the deletion so plugins can act afterwards based on the activity.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @param int $activity_id The activity ID.
@@ -198 +197 @@
  * Mark specific activity item as spam and redirect to previous page.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param int $activity_id Activity id to be deleted. Defaults to 0.
@@ -233 +232 @@
          * Fires before the marking activity as spam so plugins can modify things if they want to.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param int    $activity_id Activity ID to be marked as spam.
@@ -250 +249 @@
          * Fires after the marking activity as spam so plugins can act afterwards based on the activity.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param int $activity_id Activity ID that was marked as spam.
@@ -268 +267 @@
  * Post user/group activity update.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses is_user_logged_in()
@@ -298 +297 @@
          * Filters the content provided in the activity input field.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $value Activity message being posted.
@@ -309 +308 @@
                  * Filters the item type that the activity update should be associated with.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value Item type to associate with.
@@ -321 +320 @@
                  * Filters what component the activity is being to.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value Chosen component to post activity to.
@@ -349 +348 @@
                  * Filters activity object for BuddyPress core and plugin authors before posting activity update.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $object  Activity item being associated to.
@@ -372 +371 @@
  * Post new activity comment.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses is_user_logged_in()
@@ -398 +397 @@
          * Filters the activity ID a comment will be in reply to.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $value ID of the activity being replied to.
@@ -407 +406 @@
          * Filters the comment content for a comment reply.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $value Comment content being posted.
@@ -436 +435 @@
  * Mark activity as favorite.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses is_user_logged_in()
@@ -470 +469 @@
  * Remove activity from favorites.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses is_user_logged_in()
@@ -504 +503 @@
  * Load the sitewide activity feed.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_is_activity_component()
@@ -536 +535 @@
  * Load a user's personal activity feed.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_is_user_activity()
@@ -566 +565 @@
  * Load a user's friends' activity feed.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_is_active()
@@ -599 +598 @@
  * Load the activity feed for a user's groups.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_is_active()
@@ -640 +639 @@
  * Load a user's @mentions feed.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_is_user_activity()
@@ -677 +676 @@
  * Load a user's favorites feed.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_is_user_activity()
@@ -712 +711 @@
  * Loads Akismet filtering for activity.
  *
- * @since BuddyPress (1.6.0)
- * @since BuddyPress (2.3.0) We only support Akismet 3+.
+ * @since 1.6.0
+ * @since 2.3.0 We only support Akismet 3+.
  */
 function bp_activity_setup_akismet() {
@@ -736 +735 @@
          * Filters if BuddyPress Activity Akismet support has been disabled by another plugin.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param bool $value Return value of bp_is_akismet_active boolean function.
@@ -751 +750 @@
  * AJAX endpoint for Suggestions API lookups.
  *
- * @since BuddyPress (2.1.0)
+ * @since 2.1.0
  */
 function bp_ajax_get_suggestions() {
@@ -783 +782 @@
  * Detect a change in post type status, and initiate an activity update if necessary.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @todo Support untrashing better.
@@ -817 +816 @@
                          * being untrashed.
                          *
-                         * @since BuddyPress (2.2.0)
+                         * @since 2.2.0
                          *
                          * @param WP_Post $post Post data.

trunk/src/bp-activity/bp-activity-admin.php

@@ -6 +6 @@
  * help text, on which this implementation is heavily based.
  *
+ * @since 1.6.0
  * @package BuddyPress
- * @since BuddyPress (1.6.0)
- * @subpackage Activity
+ * @subpackage ActivityAdmin
  */
 
@@ -24 +24 @@
  * Register the Activity component admin screen.
  *
- * @since BuddyPress (1.6)
+ * @since 1.6.0
  */
 function bp_activity_add_admin_menu() {
@@ -50 +50 @@
  * adds the Activity page to the array of these menu items.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  *
  * @param array $custom_menus The list of top-level BP menu items.
@@ -68 +68 @@
  * table row.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  */
 function bp_activity_admin_reply() {
@@ -138 +138 @@
  * Handle save/update of screen options for the Activity component admin screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param string $value     Will always be false unless another plugin filters it first.
@@ -161 +161 @@
  * Hide the advanced edit meta boxes by default, so we don't clutter the screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param array     $hidden Array of items to hide.
@@ -178 +178 @@
          * Filters default hidden metaboxes so plugins can alter list.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param array     $hidden Default metaboxes to hide.
@@ -195 +195 @@
  *   - Catches POST and GET requests related to Activity.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @global object                 $bp                     BuddyPress global settings.
@@ -213 +213 @@
          * Fires at top of Activity admin page.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param string $doaction Current $_GET action being performed in admin screen.
@@ -321 +321 @@
                  * Filters list of IDs being spammed/un-spammed/deleted.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array $activity_ids Activity IDs to spam/un-spam/delete.
@@ -413 +413 @@
                  * Passes an activity array counts how many were spam, not spam, deleted, and IDs that were errors.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array  $value        Array holding spam, not spam, deleted counts, error IDs.
@@ -438 +438 @@
                  * Filters redirect URL after activity spamming/un-spamming/deletion occurs.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param string $redirect_to URL to redirect to.
@@ -555 +555 @@
                  * Fires before redirect so plugins can do something first on save action.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array Array holding activity object and ID that holds error.
@@ -570 +570 @@
                  * Filters URL to redirect to after saving.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param string $redirect_to URL to redirect to.
@@ -588 +588 @@
  * Output the Activity component admin screens.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  */
 function bp_activity_admin() {
@@ -606 +606 @@
  * Display the single activity edit screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  */
 function bp_activity_admin_edit() {
@@ -641 +641 @@
          * Fires before activity edit form is displays so plugins can modify the activity.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param array $value Array holding single activity object that was passed by reference.
@@ -703 +703 @@
  * Status metabox for the Activity admin edit screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param object $item Activity item.
@@ -759 +759 @@
  * Primary link metabox for the Activity admin edit screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param object $item Activity item.
@@ -776 +776 @@
  * User ID metabox for the Activity admin edit screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param object $item Activity item.
@@ -794 +794 @@
  * Format is [activity_type] => Pretty name for activity type.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @return array
@@ -822 +822 @@
  * Activity type metabox for the Activity admin edit screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param object $item Activity item.
@@ -868 +868 @@
  * Primary item ID/Secondary item ID metabox for the Activity admin edit screen.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param object $item Activity item.
@@ -890 +890 @@
  * Display the Activity admin index screen, which contains a list of all the activities.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @global BP_Activity_List_Table $bp_activity_list_table Activity screen list table.
@@ -958 +958 @@
          * Fires before edit form is displayed so plugins can modify the activity messages.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param array $messages Array of messages to display at top of page.
@@ -1024 +1024 @@
  * List table class for the Activity component admin page.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  */
 class BP_Activity_List_Table extends WP_List_Table {
@@ -1033 +1033 @@
          * e.g. "all", "pending", "approved", "spam"...
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          * @var string
          */
@@ -1041 +1041 @@
          * How many activity items have been marked as spam.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          * @var int
          */
@@ -1049 +1049 @@
          * Store activity-to-user-ID mappings for use in the In Response To column.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          * @var array
          */
@@ -1057 +1057 @@
          * If users can comment on blog & forum activity items.
          *
-         * @since BuddyPress (2.2.2)
+         * @since 2.2.2
          *
          * @link https://buddypress.trac.wordpress.org/ticket/6277
@@ -1068 +1068 @@
          * Constructor.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         public function __construct() {
@@ -1087 +1087 @@
          * Handle filtering of data, sorting, pagination, and any other data manipulation prior to rendering.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         function prepare_items() {
@@ -1189 +1189 @@
          * Get an array of all the columns on the page.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @return array Column headers.
@@ -1207 +1207 @@
          * Get name of default primary column
          *
-         * @since BuddyPress (2.3.3)
+         * @since 2.3.3
          * @access protected
          *
@@ -1219 +1219 @@
          * Display a message on screen when no items are found (e.g. no search matches).
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         function no_items() {
@@ -1228 +1228 @@
          * Output the Activity data table.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
         */
         function display() {
@@ -1258 +1258 @@
          * Generate content for a single row of the table.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param object $item The current item.
@@ -1287 +1287 @@
          * Get the list of views available on this table (e.g. "all", "spam").
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         function get_views() {
@@ -1301 +1301 @@
                          * Fires inside listing of views so plugins can add their own.
                          *
-                         * @since BuddyPress (1.6.0)
+                         * @since 1.6.0
                          *
                          * @param string $url_base Current URL base for view.
@@ -1314 +1314 @@
          * Get bulk actions.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @return array Key/value pairs for the bulk actions dropdown.
@@ -1327 +1327 @@
                  * Filters the default bulk actions so plugins can add custom actions.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array $actions Default available actions for bulk operations.
@@ -1337 +1337 @@
          * Get the table column titles.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see WP_List_Table::single_row_columns()
@@ -1358 +1358 @@
          * Currently, returns an empty array (no columns are sortable).
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          * @todo For this to work, BP_Activity_Activity::get() needs updating
          *       to support ordering by specific fields.
@@ -1375 +1375 @@
          * Markup for the "filter" part of the form (i.e. which activity type to display).
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param string $which 'top' or 'bottom'.
@@ -1459 +1459 @@
          * Checkbox column markup.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see WP_List_Table::single_row_columns()
@@ -1472 +1472 @@
          * Author column markup.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see WP_List_Table::single_row_columns()
@@ -1485 +1485 @@
          * Action column markup.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @see WP_List_Table::single_row_columns()
@@ -1506 +1506 @@
          * Called "comment" in the CSS so we can re-use some WP core CSS.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see WP_List_Table::single_row_columns()
@@ -1565 +1565 @@
                  * Filters available actions for plugins to alter.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array $actions Array of available actions user could use.
@@ -1584 +1584 @@
                          * Filters current activity item content.
                          *
-                         * @since BuddyPress (1.2.0)
+                         * @since 1.2.0
                          *
                          * @param array $item Array index holding current activity item content.
@@ -1593 +1593 @@
                          * Filters current activity item action.
                          *
-                         * @since BuddyPress (1.2.0)
+                         * @since 1.2.0
                          *
                          * @var array $item Array index holding current activity item action.
@@ -1606 +1606 @@
          * "In response to" column markup.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see WP_List_Table::single_row_columns()
@@ -1618 +1618 @@
                  * Filters default list of default root activity types.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array $value Array of default activity types.
@@ -1649 +1649 @@
          * avoiding duplicate queries.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param int $activity_id Activity ID to retrieve User ID for.
@@ -1690 +1690 @@
          * functions from working as intended.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param array $item An array version of the BP_Activity_Activity object.
@@ -1742 +1742 @@
                  * Filters if an activity item can be commented on or not.
                  *
-                 * @since BuddyPress (2.0.0)
+                 * @since 2.0.0
                  *
                  * @param bool $can_comment Whether an activity item can be commented on or not.
@@ -1755 +1755 @@
          * items plus their comments. This method converts it to a flat array.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param array $tree Source array.

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

@@ -3 +3 @@
  * Akismet support for BuddyPress' Activity Stream.
  *
+ * @since 1.6.0
  * @package BuddyPress
- * @since BuddyPress (1.6.0)
- * @subpackage Activity
+ * @subpackage ActivityAkismet
  */
 
@@ -14 +14 @@
  * Akismet support for the Activity component.
  *
- * @since BuddyPress (1.6.0)
- * @since BuddyPress (2.3.0) We only support Akismet 3+.
+ * @since 1.6.0
+ * @since 2.3.0 We only support Akismet 3+.
  */
 class BP_Akismet {
@@ -23 +23 @@
          * @access protected
          * @var BP_Activity_Activity
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         protected $last_activity = null;
@@ -30 +30 @@
          * Constructor.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         public function __construct() {
@@ -39 +39 @@
          * Hook Akismet into the activity stream.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         protected function setup_actions() {
@@ -71 +71 @@
          * akismet_comment_row_action() function. Thanks!
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param array $actions  The hover links.
@@ -118 +118 @@
                  * Filters the list of actions for the current activity's row.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array $actions Array of available actions for the current activity item's row.
@@ -132 +132 @@
          * by Akismet to help detect spam activity.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see https://plugins.trac.wordpress.org/ticket/1232
@@ -161 +161 @@
          * default AJAX implementation; see bp_dtheme_post_update().
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see bp_dtheme_post_update()
@@ -187 +187 @@
          * This function is intended to be used inside the activity stream loop.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         public function add_activity_spam_button() {
@@ -215 +215 @@
          * This function is intended to be used inside the activity stream loop.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         public function add_activity_comment_spam_button() {
@@ -242 +242 @@
          * Get a filterable list of activity types that Akismet should automatically check for spam.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @static
@@ -253 +253 @@
                  * Filters the list of activity types that Akismet should automatically check for spam.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array Array of default activity types for Akismet to check.
@@ -263 +263 @@
          * Mark activity item as spam.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param BP_Activity_Activity $activity Activity item being spammed.
@@ -277 +277 @@
                  * Fires after marking an activity item has been marked as spam.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param BP_Activity_Activity $activity Activity object being marked as spam.
@@ -291 +291 @@
          * Mark activity item as ham.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param BP_Activity_Activity $activity Activity item being hammed.
@@ -306 +306 @@
                  * Fires after marking an activity item has been marked as ham.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param BP_Activity_Activity $activity Activity object being marked as ham.
@@ -320 +320 @@
          * Build a data package for the Akismet service to inspect.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see http://akismet.com/development/api/#comment-check
@@ -360 +360 @@
                  * Filters activity data before being sent to Akismet to inspect.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array                $activity_data Array of activity data for Akismet to inspect.
@@ -371 +371 @@
          * Check if the activity item is spam or ham.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see http://akismet.com/development/api/
@@ -404 +404 @@
                          * Fires after an activity item has been proven to be spam, but before officially being marked as spam.
                          *
-                         * @since BuddyPress (1.6.0)
+                         * @since 1.6.0
                          *
                          * @param BP_Activity_Activity $activity      The activity item proven to be spam.
@@ -423 +423 @@
          * Update activity meta after a manual spam change (user-initiated).
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param BP_Activity_Activity $activity The activity to check.
@@ -440 +440 @@
          * Update activity meta after a manual ham change (user-initiated).
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param BP_Activity_Activity $activity The activity to check.
@@ -457 +457 @@
          * Update activity meta after an automatic spam check (not user-initiated).
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param BP_Activity_Activity $activity The activity to check.
@@ -495 +495 @@
          * Props to WordPress core Akismet plugin for a lot of this.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param array  $activity_data Packet of information to submit to Akismet.
@@ -566 +566 @@
          * Filters user agent when sending to Akismet to add BuddyPress info.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param string $user_agent User agent string, as generated by Akismet.
@@ -580 +580 @@
          * Adds a "History" meta box to the activity edit screen.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param string $screen_action The type of screen that has been requested.
@@ -596 +596 @@
          * History meta box for the Activity admin edit screen.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @see https://buddypress.trac.wordpress.org/ticket/3907
@@ -617 +617 @@
          * Update an activity item's Akismet history.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param int    $activity_id Activity item ID.
@@ -638 +638 @@
          * Get an activity item's Akismet history.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param int $activity_id Activity item ID.
@@ -662 +662 @@
  * grow to be quite large.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @global wpdb $wpdb WordPress database object.
@@ -674 +674 @@
          * Filters the threshold for how many days old Akismet metadata needs to be before being automatically deleted.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param integer 15 How many days old metadata needs to be.

trunk/src/bp-activity/bp-activity-cache.php

@@ -1 +1 @@
 <?php
-
 /**
  * Functions related to the BuddyPress Activity component and the WP Cache.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
+ * @package    BuddyPress
+ * @subpackage ActivityCache
  */
 
@@ -38 +39 @@
  * Clear a cached activity item when that item is updated.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param BP_Activity_Activity $activity
@@ -51 +52 @@
  * Clear cached data for deleted activity items.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param array $deleted_ids IDs of deleted activity items.

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

@@ -4 +4 @@
  *
  * @package BuddyPress
- * @subpackage Activity
+ * @subpackage ActivityClasses
  */
 

trunk/src/bp-activity/bp-activity-cssjs.php

@@ -1 +1 @@
 <?php
-
 /**
  * Activity component CSS/JS
@@ -14 +13 @@
  * Enqueue @mentions JS.
  *
- * @since BuddyPress (2.1.0)
+ * @since 2.1.0
  */
 function bp_activity_mentions_script() {
@@ -51 +50 @@
          * friends to the page for quicker @mentions lookups.
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          */
         do_action( 'bp_activity_mentions_prime_results' );
@@ -61 +60 @@
  * Bind the mentions listener to a wp_editor instance when TinyMCE initializes.
  *
- * @since BuddyPress (2.3.3)
+ * @since 2.3.3
  *
  * @param array  $settings   An array with TinyMCE config.

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

@@ -1 +1 @@
 <?php
-
 /**
  * Filters related to the Activity component.
@@ -114 +113 @@
  * Types of activity stream items to moderate.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @return array $types List of the activity types to moderate.
@@ -127 +126 @@
          * Filters the default activity types that BuddyPress should moderate.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param array $types Default activity types to moderate.
@@ -137 +136 @@
  * Moderate the posted activity item, if it contains moderate keywords.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param BP_Activity_Activity $activity The activity object to check.
@@ -156 +155 @@
  * Mark the posted activity as spam, if it contains blacklist keywords.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param BP_Activity_Activity $activity The activity object to check.
@@ -174 +173 @@
  * Custom kses filtering for activity content.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @uses apply_filters() To call the 'bp_activity_allowed_tags' hook.
@@ -209 +208 @@
          * Filters the allowed HTML tags for BuddyPress Activity content.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $value Array of allowed HTML tags and attributes.
@@ -220 +219 @@
  * Find and link @-mentioned users in the contents of a given item.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @param string $content     The contents of a given item.
@@ -279 +278 @@
  * hook to send mention notifications after the activity item is saved.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_activity_find_mentions()
@@ -316 +315 @@
  * Sends emails and BP notifications for users @-mentioned in an activity item.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  *
  * @uses bp_activity_at_message_notification()
@@ -345 +344 @@
                  * Filters BuddyPress' ability to send email notifications for @mentions.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param bool  $value     Whether or not BuddyPress should send a notification to the mentioned users.
@@ -362 +361 @@
  * Catch links in activity text so rel=nofollow can be added.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @param string $text Activity text.
@@ -375 +374 @@
          * Add rel=nofollow to a link.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $matches Items matched by preg_replace_callback() in bp_activity_make_nofollow_filter().
@@ -392 +391 @@
  * This method can only be used inside the Activity loop.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_is_single_activity()
@@ -412 +411 @@
          * Provides a filter that lets you choose whether to skip this filter on a per-activity basis.
          *
-         * @since BuddyPress (2.3.0)
+         * @since 2.3.0
          *
          * @param bool $value If true, text should be checked to see if it needs truncating.
@@ -429 +428 @@
          * Filters the appended text for the activity excerpt.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param string $value Internationalized "Read more" text.
@@ -438 +437 @@
          * Filters the excerpt length for the activity excerpt.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param int $value Number indicating how many words to trim the excerpt down to.
@@ -460 +459 @@
          * Filters the composite activity excerpt entry.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param string $excerpt     Excerpt text and markup to be displayed.
@@ -472 +471 @@
  * Include extra JavaScript dependencies for activity component.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @uses bp_activity_do_heartbeat() to check if heartbeat is required.
@@ -495 +494 @@
  * dynamically into the activity stream.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param string $classes
@@ -515 +514 @@
  * Check if Activity Heartbeat feature i on to add a timestamp class.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param string $classes
@@ -542 +541 @@
  * Use WordPress Heartbeat API to check for latest activity update.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @uses bp_activity_get_last_updated() to get the recorded date of the last activity.
@@ -607 +606 @@
  * Set the strings for WP HeartBeat API where needed.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param array $strings Localized strings.
@@ -624 +623 @@
          * Filter that checks whether the global heartbeat settings already exist.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param array $value Heartbeat settings array.
@@ -637 +636 @@
          * Filters the pulse frequency to be used for the BuddyPress Activity heartbeat.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param int $value The frequency in seconds between pulses.
@@ -669 +668 @@
  * Set up activity arguments for use with the 'just-me' scope.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param array $retval Empty array by default.
@@ -719 +718 @@
  * Set up activity arguments for use with the 'favorites' scope.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param array $retval Empty array by default.
@@ -777 +776 @@
  * Set up activity arguments for use with the 'favorites' scope.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param array $retval Empty array by default.

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

@@ -1 +1 @@
 <?php
-
 /**
  * BuddyPress Activity Functions.
@@ -16 +15 @@
  * Check whether the $bp global lists an activity directory page.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @return bool True if activity directory page is found, otherwise false.
@@ -39 +38 @@
  *   add_filter( 'bp_activity_do_mentions', '__return_false' );
  *
- * @since BuddyPress (1.8.0)
+ * @since 1.8.0
  *
  * @uses apply_filters() To call 'bp_activity_do_mentions' hook.
@@ -50 +49 @@
          * Filters whether or not mentions are enabled.
          *
-         * @since BuddyPress (1.8.0)
+         * @since 1.8.0
          *
          * @param bool $enabled True to enable mentions, false to disable.
@@ -61 +60 @@
  * mentions suggestions?
  *
- * @since BuddyPress (2.1.0)
+ * @since 2.1.0
  *
  * @return bool True if mentions scripts should be loaded.
@@ -72 +71 @@
          * Filters whether or not BuddyPress should load mentions scripts and assets.
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          *
          * @param bool $load_mentions    True to load mentions assets, false otherwise.
@@ -83 +82 @@
  * Locate usernames in an activity content string, as designated by an @ sign.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @param string $content The content of the activity, usually found in
@@ -126 +125 @@
  * Reset a user's unread mentions list and count.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_delete_user_meta()
@@ -145 +144 @@
  * Currently, only used in {@link bp_activity_delete()}.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_activity_find_mentions()
@@ -185 +184 @@
  * for @mentions.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  *
  * @uses bp_get_user_meta()
@@ -243 +242 @@
  * Determine a user's "mentionname", the name used for that user in @-mentions.
  *
- * @since BuddyPress (1.9.0)
+ * @since 1.9.0
  *
  * @param int|string $user_id ID of the user to get @-mention name for.
@@ -268 +267 @@
  * Get a user ID from a "mentionname", the name used for a user in @-mentions.
  *
- * @since BuddyPress (1.9.0)
+ * @since 1.9.0
  *
  * @param string $mentionname Username of user in @-mentions.
@@ -323 +322 @@
  * sites, etc) will not work.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @param  string        $component_id    The unique string ID of the component.
@@ -361 +360 @@
          * Filters the action type being set for the current activity item.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @param array    $array           Array of arguments for action type being set.
@@ -387 +386 @@
  * Set tracking arguments for a given post type.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @global $wp_post_types
@@ -443 +442 @@
  * Get tracking arguments for a specific post type.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param  string $post_type Name of the post type.
@@ -500 +499 @@
          * Filters tracking arguments for a specific post type.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param object $post_type_activity The tracking arguments of the post type.
@@ -511 +510 @@
  * Get tracking arguments for all post types.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @return array List of post types with their tracking arguments.
@@ -533 +532 @@
          * Filters tracking arguments for all post types.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param array $post_types_tracking_args Array of post types with
@@ -544 +543 @@
  * Get all components' activity actions, sorted by their position attribute.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @return object Actions ordered by their position.
@@ -590 +589 @@
  * Retrieve the current action from a component and key.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @uses apply_filters() To call the 'bp_activity_get_action' hook.
@@ -616 +615 @@
          * Filters the current action by component and key.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @param string|bool $retval       The action key.
@@ -628 +627 @@
  * Fetch details of all registered activity types.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  *
  * @return array array( type => description ), ...
@@ -650 +649 @@
          * Filters the available activity types.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          *
          * @param array $actions Array of registered activity types.
@@ -662 +661 @@
  * Get a users favorite activity stream items.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_user_meta()
@@ -684 +683 @@
          * Filters the favorited activity items for a specified user.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $favs Array of user's favorited activity items.
@@ -694 +693 @@
  * Add an activity stream item as a favorite for a user.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses is_user_logged_in()
@@ -747 +746 @@
                  * Fires if bp_activity_update_meta() for favorite_count is successful and before returning a true value for success.
                  *
-                 * @since BuddyPress (1.2.1)
+                 * @since 1.2.1
                  *
                  * @param int $activity_id ID of the activity item being favorited.
@@ -763 +762 @@
                  * Fires if bp_activity_update_meta() for favorite_count is unsuccessful and before returning a false value for failure.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param int $activity_id ID of the activity item being favorited.
@@ -777 +776 @@
  * Remove an activity stream item as a favorite for a user.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses is_user_logged_in()
@@ -828 +827 @@
                                  * Fires if bp_update_user_meta() is successful and before returning a true value for success.
                                  *
-                                 * @since BuddyPress (1.2.1)
+                                 * @since 1.2.1
                                  *
                                  * @param int $activity_id ID of the activity item being unfavorited.
@@ -857 +856 @@
  * Check whether an activity item exists with a given content string.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @uses BP_Activity_Activity::check_exists_by_content() {@link BP_Activity_Activity}
@@ -871 +870 @@
          * Filters the results of the check for whether an activity item exists by specified content.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @param BP_Activity_Activity $content_exists ID of the activity if found, else null.
@@ -881 +880 @@
  * Retrieve the last time activity was updated.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses BP_Activity_Activity::get_last_updated() {@link BP_Activity_Activity}
@@ -893 +892 @@
          * Filters the value for the last updated time for an activity item.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @param BP_Activity_Activity $last_updated Date last updated.
@@ -903 +902 @@
  * Retrieve the number of favorite activity stream items a user has.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses BP_Activity_Activity::total_favorite_count() {@link BP_Activity_Activity}
@@ -926 +925 @@
  * Delete a meta entry from the DB for an activity stream item.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @global object $wpdb WordPress database access object.
@@ -970 +969 @@
  * Get metadata for a given activity item.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses apply_filters() To call the 'bp_activity_get_meta' hook.
@@ -992 +991 @@
          * Filters the metadata for a specified activity item.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param mixed  $retval      The meta values for the activity item.
@@ -1005 +1004 @@
  * Update a piece of activity meta.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @param int    $activity_id ID of the activity item whose metadata is being updated.
@@ -1028 +1027 @@
  * Add a piece of activity metadata.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param int    $activity_id ID of the activity item.
@@ -1052 +1051 @@
  * Completely remove a user's activity data.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses is_user_logged_in()
@@ -1084 +1083 @@
          * Fires after the removal of all of a user's activity data.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param int $user_id ID of the user being deleted.
@@ -1096 +1095 @@
  * Mark all of the user's activity as spam.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @global object $wpdb WordPress database access object.
@@ -1154 +1153 @@
          * Fires after all activity data from a user has been marked as spam.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param int   $user_id    ID of the user whose activity is being marked as spam.
@@ -1166 +1165 @@
  * Mark all of the user's activity as ham (not spam).
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @global object $wpdb WordPress database access object.
@@ -1225 +1224 @@
          * Fires after all activity data from a user has been marked as ham.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param int   $user_id    ID of the user whose activity is being marked as ham.
@@ -1237 +1236 @@
  * Register the activity stream actions for updates.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  */
 function bp_activity_register_activity_actions() {
@@ -1264 +1263 @@
          * Allows plugin authors to add their own activity actions alongside the core actions.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         do_action( 'bp_activity_register_activity_actions' );
@@ -1300 +1299 @@
          * Filters the string for the activity action being returned.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param BP_Activity_Activity $action   Action string being requested.
@@ -1316 +1315 @@
  * Format 'activity_update' activity actions.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param string $action   Static activity action.
@@ -1329 +1328 @@
          * Filters the formatted activity action update string.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string               $action   Activity action string value.
@@ -1340 +1339 @@
  * Format 'activity_comment' activity actions.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param string $action   Static activity action.
@@ -1353 +1352 @@
          * Filters the formatted activity action comment string.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string               $action   Activity action string value.
@@ -1364 +1363 @@
  * Format activity action strings for custom post types.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param string $action   Static activity action.
@@ -1411 +1410 @@
          * Filters the formatted custom post type activity post action string.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param string               $action   Activity action string value.
@@ -1435 +1434 @@
  *   - 'per_page' (false)
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see BP_Activity_Activity::get() For more information on accepted arguments
@@ -1534 +1533 @@
          * Filters the requested activity item(s).
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param BP_Activity_Activity $activity Requested activity object.
@@ -1545 +1544 @@
  * Fetch specific activity items.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see BP_Activity_Activity::get() For more information on accepted arguments.
@@ -1589 +1588 @@
          * Filters the requested specific activity item.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param BP_Activity_Activity $activity Requested activity object.
@@ -1601 +1600 @@
  * Add an activity item.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @uses wp_parse_args()
@@ -1701 +1700 @@
          * Fires at the end of the execution of adding a new activity item, before returning the new activity item ID.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @param array $r Array of parsed arguments for the activity item being added.
@@ -1713 +1712 @@
  * Post an activity update.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses wp_parse_args()
@@ -1754 +1753 @@
          * Filters the new activity content for current activity item.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $activity_content Activity content posted by user.
@@ -1763 +1762 @@
          * Filters the activity primary link for current activity item.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $primary_link Link to the profile for the user who posted the activity.
@@ -1781 +1780 @@
          * Filters the latest update content for the activity item.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param string $r                Content of the activity update.
@@ -1797 +1796 @@
          * Fires at the end of an activity post update, before returning the updated activity item ID.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $content     Content of the activity post update.
@@ -1811 +1810 @@
  * Create an activity item for a newly published post type post.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param  int      $post_id ID of the new post.
@@ -1861 +1860 @@
          * that lets components or plugins bail early if needed.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param bool $value   Whether or not to continue.
@@ -1935 +1934 @@
          * Fires after the publishing of an activity item for a newly published post type post.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param int     $activity_id   ID of the newly published activity item.
@@ -1949 +1948 @@
  * Update the activity item for a custom post type entry.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param  WP_Post $post Post item.
@@ -2005 +2004 @@
          * Fires after the updating of an activity item for a custom post type entry.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param WP_Post              $post     Post object.
@@ -2018 +2017 @@
  * Unpublish an activity for the custom post type.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  *
  * @param  int     $post_id ID of the post being unpublished.
@@ -2055 +2054 @@
          * Fires after the unpublishing for the custom post type.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param array   $delete_activity_args Array of arguments for activity deletion.
@@ -2069 +2068 @@
  * Add an activity comment.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses wp_parse_args()
@@ -2140 +2139 @@
          * Filters the content of a new comment.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $r Content for the newly posted comment.
@@ -2173 +2172 @@
          * Fires near the end of an activity comment posting, before the returning of the comment ID.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param int   $comment_id ID of the newly posted activity comment.
@@ -2192 +2191 @@
  * Fetch the activity_id for an existing activity entry in the DB.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see BP_Activity_Activity::get() For more information on accepted arguments.
@@ -2219 +2218 @@
          * Filters the activity ID being requested.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param BP_Activity_Activity $value ID returned by BP_Activity_Activity get_id() method with provided arguments.
@@ -2248 +2247 @@
  * If you are deleting an activity comment please use bp_activity_delete_comment();
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @see BP_Activity_Activity::get() For more information on accepted arguments.
@@ -2289 +2288 @@
          * Fires before an activity item proceeds to be deleted.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param array $args Array of arguments to be used with the activity deletion.
@@ -2318 +2317 @@
          * Fires after the activity item has been deleted.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @param array $args Array of arguments used with the activity deletion.
@@ -2327 +2326 @@
          * Fires after the activity item has been deleted.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $activity_ids_deleted Array of affected activity item IDs.
@@ -2343 +2342 @@
          * You should use bp_activity_delete() instead.
          *
-         * @since BuddyPress (1.1.0)
-         * @deprecated BuddyPress (1.2.0)
+         * @since 1.1.0
+         * @deprecated 1.2.0
          *
          * @uses wp_parse_args()
@@ -2370 +2369 @@
          * Delete an activity item by activity id.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @uses bp_activity_delete()
@@ -2387 +2386 @@
          * You should use bp_activity_delete() instead.
          *
-         * @since BuddyPress (1.1.0)
-         * @deprecated BuddyPress (1.2.0)
+         * @since 1.1.0
+         * @deprecated 1.2.0
          *
          * @uses bp_activity_delete()
@@ -2413 +2412 @@
          * You should use bp_activity_delete() instead.
          *
-         * @since BuddyPress (1.1.0)
-         * @deprecated BuddyPress (1.2.0)
+         * @since 1.1.0
+         * @deprecated 1.2.0
          *
          * @uses bp_activity_delete()
@@ -2433 +2432 @@
  * Delete an activity comment.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses apply_filters() To call the 'bp_activity_delete_comment_pre' hook.
@@ -2459 +2458 @@
          * handle the deletion of child comments differently. Make sure you return false.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param bool $value       Whether BuddyPress should continue or not.
@@ -2486 +2485 @@
          * Fires at the end of the deletion of an activity comment, before returning success.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param int $activity_id ID of the activity that has had a comment deleted from.
@@ -2499 +2498 @@
          * Delete an activity comment's children.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses BP_Activity_Activity::get_child_comments() {@link BP_Activity_Activity}
@@ -2537 +2536 @@
  * have it available.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_root_domain()
@@ -2583 +2582 @@
          * Filters the activity permalink for the specified activity item.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $array Array holding activity permalink and activity item object.
@@ -2593 +2592 @@
  * Hide a user's activity.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses BP_Activity_Activity::hide_all_for_user() {@link BP_Activity_Activity}
@@ -2617 +2616 @@
  * As of BuddyPress 2.3, this function is no longer in use.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses esc_attr()
@@ -2679 +2678 @@
          * Filters the activity content that had a thumbnail replace images.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $content Activity content that had images replaced in.
@@ -2695 +2694 @@
  * activity in the future.
  *
- * @since BuddyPress (2.3.0)
+ * @since 2.3.0
  *
  * @param string $content  The content of the activity item.
@@ -2718 +2717 @@
          * Use this filter to change the media extractor used to extract media info for the activity item.
          *
-         * @since BuddyPress (2.3.0)
+         * @since 2.3.0
          *
          * @param string $extractor Class name.
@@ -2730 +2729 @@
          * Filter the arguments passed to the media extractor when creating an Activity summary.
          *
-         * @since BuddyPress (2.3.0)
+         * @since 2.3.0
          *
          * @param array              $args      Array of bespoke data for the media extractor.
@@ -2803 +2802 @@
                  * Filter the results of the media extractor when creating an Activity summary.
                  *
-                 * @since BuddyPress (2.3.0)
+                 * @since 2.3.0
                  *
                  * @param array  $extracted_media Extracted media item. See {@link BP_Media_Extractor::extract()} for format.
@@ -2840 +2839 @@
          * Filters the newly-generated summary for the activity item.
          *
-         * @since BuddyPress (2.3.0)
+         * @since 2.3.0
          *
          * @param string $summary         Activity summary HTML.
@@ -2853 +2852 @@
  * Fetch whether the current user is allowed to mark items as spam.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @return bool True if user is allowed to mark activity items as spam.
@@ -2862 +2861 @@
          * Filters whether the current user should be able to mark items as spam.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param bool $moderate Whether or not the current user has bp_moderate capability.
@@ -2872 +2871 @@
  * Mark an activity item as spam.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param BP_Activity_Activity $activity The activity item to be spammed.
@@ -2907 +2906 @@
          * Fires at the end of the process to mark an activity item as spam.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param BP_Activity_Activity $activity Activity item being marked as spam.
@@ -2919 +2918 @@
  * Mark an activity item as ham.
  *
- * @since BuddyPress (1.6.0)
+ * @since 1.6.0
  *
  * @param BP_Activity_Activity $activity The activity item to be hammed. Passed by reference.
@@ -2954 +2953 @@
          * Fires at the end of the process to mark an activity item as ham.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param BP_Activity_Activity $activity Activity item being marked as ham.
@@ -2976 +2975 @@
  * For that, see {@link bp_activity_comment_embed()}.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @see BP_Embed
@@ -3001 +3000 @@
  * the cache if they are not there yet.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @see BP_Embed
@@ -3021 +3020 @@
  * When a user clicks on a "Read More" item, make sure embeds are correctly parsed and shown for the expanded content.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @see BP_Embed
@@ -3046 +3045 @@
  * once the comments are done being processed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @see bp_activity_comment_embed()
@@ -3061 +3060 @@
  * Used during {@link BP_Embed::parse_oembed()} via {@link bp_activity_embed()}.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @see BP_Embed::parse_oembed()
@@ -3082 +3081 @@
  * Used during {@link BP_Embed::parse_oembed()} via {@link bp_activity_embed()}.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @see BP_Embed::parse_oembed()
@@ -3101 +3100 @@
  * Should we use Heartbeat to refresh activities?
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @uses bp_is_activity_heartbeat_active() to check if heartbeat setting is on.

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

@@ -1 +1 @@
 <?php
-
 /**
  * BuddyPress Activity Streams Loader.
@@ -16 +15 @@
  * Main Activity Class.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  */
 class BP_Activity_Component extends BP_Component {
@@ -23 +22 @@
          * Start the activity component setup process.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          */
         public function __construct() {
@@ -39 +38 @@
          * Include component files.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @see BP_Component::includes() for a description of arguments.
@@ -81 +80 @@
          * backwards compatibility.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @see BP_Component::setup_globals() for a description of arguments.
@@ -125 +124 @@
          * Set up component navigation.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @see BP_Component::setup_nav() for a description of arguments.
@@ -233 +232 @@
          * Set up the component entries in the WordPress Admin Bar.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
@@ -330 +329 @@
          * Set up the title for pages and <title>.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @uses bp_is_activity_component()
@@ -360 +359 @@
          * Set up actions necessary for the component.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          */
         public function setup_actions() {
@@ -373 +372 @@
          * Setup cache groups.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          */
         public function setup_cache_groups() {

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

@@ -1 +1 @@
 <?php
-
 /**
  * BuddyPress Activity Notifications.
@@ -16 +15 @@
  * Send email and BP notifications when a user is mentioned in an update.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_notifications_add_notification()
@@ -103 +102 @@
                  * Filters the user email that the @mention notification will be sent to.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $to User email the notification is being sent to.
@@ -112 +111 @@
                  * Filters the @mention notification subject that will be sent to user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $subject     Email notification subject text.
@@ -122 +121 @@
                  * Filters the @mention notification message that will be sent to user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $message       Email notification message text.
@@ -138 +137 @@
          * Fires after the sending of an @mention email notification.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param BP_Activity_Activity $activity         Activity Item object.
@@ -152 +151 @@
  * Send email and BP notifications when an activity item receives a comment.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_user_meta()
@@ -221 +220 @@
                  * Filters the user email that the new comment notification will be sent to.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $to User email the notification is being sent to.
@@ -230 +229 @@
                  * Filters the new comment notification subject that will be sent to user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $subject     Email notification subject text.
@@ -240 +239 @@
                  * Filters the new comment notification message that will be sent to user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $message       Email notification message text.
@@ -255 +254 @@
                  * Fires after the sending of a reply to an update email notification.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param int    $user_id      ID of the original activity item author.
@@ -309 +308 @@
                  * Filters the user email that the new comment reply notification will be sent to.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $to User email the notification is being sent to.
@@ -318 +317 @@
                  * Filters the new comment reply notification subject that will be sent to user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $subject     Email notification subject text.
@@ -328 +327 @@
                  * Filters the new comment reply notification message that will be sent to user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $message       Email notification message text.
@@ -343 +342 @@
                  * Fires after the sending of a reply to a reply email notification.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param int    $user_id      ID of the parent activity item author.
@@ -359 +358 @@
  * Helper method to map action arguments to function parameters.
  *
- * @since BuddyPress (1.9.0)
+ * @since 1.9.0
  *
  * @param int   $comment_id
@@ -374 +373 @@
  * Format notifications related to activity.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_loggedin_user_domain()
@@ -420 +419 @@
                  * or bp_activity_multiple_at_mentions_notification.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $string          HTML anchor tag for the mention.
@@ -438 +437 @@
                  * or bp_activity_multiple_at_mentions_notification.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param array  $array           Array holding the content and permalink for the mention notification.
@@ -455 +454 @@
          * Fires right before returning the formatted activity notifications.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $action            The type of activity item.
@@ -475 +474 @@
  * 'bp_activity_at_name_send_emails' equivalent helper function.
  *
- * @since BuddyPress (1.9.0)
+ * @since 1.9.0
  *
  * @param object $activity
@@ -501 +500 @@
  * Mark at-mention notifications as read when users visit their Mentions page.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_notifications_mark_all_notifications_by_type()
@@ -522 +521 @@
  * Mark at-mention notification as read when user visits the activity with the mention.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param object BP_Activity_Activity
@@ -544 +543 @@
  * Delete at-mention notifications when the corresponding activity item is deleted.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param array $activity_ids_deleted IDs of deleted activity items.

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

@@ -1 +1 @@
 <?php
-
 /**
  * BuddyPress Activity Screens.
@@ -18 +17 @@
  * Load the Activity directory.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_displayed_user_id()
@@ -35 +34 @@
                  * Fires right before the loading of the Activity directory screen template file.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  */
                 do_action( 'bp_activity_screen_index' );
@@ -42 +41 @@
                  * Filters the template to load for the Activity directory screen.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $template Path to the activity template to load.
@@ -54 +53 @@
  * Load the 'My Activity' page.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses do_action() To call the 'bp_activity_screen_my_activity' hook.
@@ -65 +64 @@
          * Fires right before the loading of the "My Activity" screen template file.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          */
         do_action( 'bp_activity_screen_my_activity' );
@@ -72 +71 @@
          * Filters the template to load for the "My Activity" screen.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @param string $template Path to the activity template to load.
@@ -82 +81 @@
  * Load the 'My Friends' activity page.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_is_active()
@@ -100 +99 @@
          * Fires right before the loading of the "My Friends" screen template file.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          */
         do_action( 'bp_activity_screen_friends' );
@@ -107 +106 @@
          * Filters the template to load for the "My Friends" screen.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @param string $template Path to the activity template to load.
@@ -117 +116 @@
  * Load the 'My Groups' activity page.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_is_active()
@@ -135 +134 @@
          * Fires right before the loading of the "My Groups" screen template file.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          */
         do_action( 'bp_activity_screen_groups' );
@@ -142 +141 @@
          * Filters the template to load for the "My Groups" screen.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $template Path to the activity template to load.
@@ -152 +151 @@
  * Load the 'Favorites' activity page.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_update_is_item_admin()
@@ -166 +165 @@
          * Fires right before the loading of the "Favorites" screen template file.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          */
         do_action( 'bp_activity_screen_favorites' );
@@ -173 +172 @@
          * Filters the template to load for the "Favorites" screen.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $template Path to the activity template to load.
@@ -183 +182 @@
  * Load the 'Mentions' activity page.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_update_is_item_admin()
@@ -197 +196 @@
          * Fires right before the loading of the "Mentions" screen template file.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          */
         do_action( 'bp_activity_screen_mentions' );
@@ -204 +203 @@
          * Filters the template to load for the "Mentions" screen.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $template Path to the activity template to load.
@@ -214 +213 @@
  * Reset the logged-in user's new mentions data when he visits his mentions screen.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_is_my_profile()
@@ -229 +228 @@
  * Load the page for a single activity item.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_is_activity_component()
@@ -303 +302 @@
          * Filters the access permission for a single activity view.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $access Array holding the current $has_access value and current activity item instance.
@@ -312 +311 @@
          * Fires before the loading of a single activity template file.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param BP_Activity_Activity $activity   Object representing the current activity item being displayed.
@@ -342 +341 @@
          * Filters the template to load for a single activity screen.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @param string $template Path to the activity template to load.
@@ -353 +352 @@
  * Add activity notifications settings to the notifications settings page.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_user_meta()
@@ -405 +404 @@
                          * Fires inside the closing </tbody> tag for activity screen notification settings.
                          *
-                         * @since BuddyPress (1.2.0)
+                         * @since 1.2.0
                          */
                         do_action( 'bp_activity_screen_notification_settings' ) ?>
@@ -423 +422 @@
  * activity template parts to the_title and the_content areas of a theme.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  */
 class BP_Activity_Theme_Compat {
@@ -430 +429 @@
          * Set up the activity component theme compatibility.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          */
         public function __construct() {
@@ -439 +438 @@
          * Set up the theme compatibility hooks, if we're looking at an activity page.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          */
         public function is_activity() {
@@ -473 +472 @@
          * This is to mirror how WordPress has {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
          *
-         * @since BuddyPress (1.8.0)
+         * @since 1.8.0
          *
          * @param string $templates The templates from bp_get_theme_compat_templates().
@@ -484 +483 @@
                  * Filters the template hierarchy for the activity directory page.
                  *
-                 * @since BuddyPress (1.8.0)
+                 * @since 1.8.0
                  *
                  * @param array $index-directory Array holding template names to be merged into template list.
@@ -502 +501 @@
          * Update the global $post with directory data.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          */
         public function directory_dummy_post() {
@@ -521 +520 @@
          * Filter the_content with the groups index template part.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          */
         public function directory_content() {
@@ -534 +533 @@
          * This is to mirror how WordPress has {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
          *
-         * @since BuddyPress (1.8.0)
+         * @since 1.8.0
          *
          * @param string $templates The templates from bp_get_theme_compat_templates().
@@ -545 +544 @@
                  * Filters the template hierarchy for the activity permalink pages.
                  *
-                 * @since BuddyPress (1.8.0)
+                 * @since 1.8.0
                  *
                  * @param array $index Array holding template names to be merged into template list.
@@ -563 +562 @@
          * Update the global $post with the displayed user's data.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          */
         public function single_dummy_post() {
@@ -582 +581 @@
          * Filter the_content with the members' activity permalink template part.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          */
         public function single_dummy_content() {

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

@@ -1 +1 @@
 <?php
-
 /**
  * BuddyPress Activity Template Functions.
@@ -14 +13 @@
  * Output the activity component slug.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_slug()
@@ -24 +23 @@
          * Return the activity component slug.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @uses apply_filters() To call the 'bp_get_activity_slug' hook.
@@ -35 +34 @@
                  * Filters the activity component slug.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $slug Activity component slug.
@@ -45 +44 @@
  * Output the activity component root slug.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_root_slug()
@@ -55 +54 @@
          * Return the activity component root slug.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @uses apply_filters() To call the 'bp_get_activity_root_slug' hook.
@@ -66 +65 @@
                  * Filters the activity component root slug.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $root_slug Activity component root slug.
@@ -76 +75 @@
  * Output activity directory permalink.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_directory_permalink()
@@ -86 +85 @@
          * Return activity directory permalink.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @uses trailingslashit()
@@ -100 +99 @@
                  * Filters the activity directory permalink.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $url Permalink url for the activity directory.
@@ -112 +111 @@
  * This is responsible for loading a group of activity items and displaying them.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  */
 class BP_Activity_Template {
@@ -118 +117 @@
          * The loop iterator.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var int
@@ -127 +126 @@
          * The activity count.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var int
@@ -136 +135 @@
          * The total activity count.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var int
@@ -145 +144 @@
          * Array of activities located by the query.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var array
@@ -154 +153 @@
          * The activity object currently being iterated on.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var object
@@ -163 +162 @@
          * A flag for whether the loop is currently being iterated.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var bool
@@ -172 +171 @@
          * URL parameter key for activity pagination. Default: 'acpage'.
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          * @var string
          */
@@ -180 +179 @@
          * The page number being requested.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var int
@@ -189 +188 @@
          * The number of items being requested per page.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var int
@@ -198 +197 @@
          * An HTML string containing pagination links.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var string
@@ -207 +206 @@
          * The displayed user's full name.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          * @access public
          * @var string
@@ -457 +456 @@
                          * Fires right before the rewinding of activity posts.
                          *
-                         * @since BuddyPress (1.1.0)
+                         * @since 1.1.0
                          */
                         do_action( 'activity_loop_end' );
@@ -494 +493 @@
                          * Fires if the current activity item is the first in the activity loop.
                          *
-                         * @since BuddyPress (1.1.0)
+                         * @since 1.1.0
                          */
                         do_action('activity_loop_start');
@@ -508 +507 @@
  * template functions to display a list of activity items.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -713 +712 @@
          * into bp-custom.php or your theme's functions.php.
          *
-         * @since BuddyPress (1.6.0)
+         * @since 1.6.0
          *
          * @param bool $value True if BuddyPress should enable afilter support.
@@ -748 +747 @@
          * Filters whether or not there are activity items to display.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @param bool   $value               Whether or not there are activity items to display.
@@ -760 +759 @@
  * Determine if there are still activities left in the loop.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -775 +774 @@
  * Get the current activity object in the loop.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -790 +789 @@
  * Output the URL for the Load More link.
  *
- * @since BuddyPress (2.1.0)
+ * @since 2.1.0
  */
 function bp_activity_load_more_link() {
@@ -798 +797 @@
          * Get the URL for the Load More link.
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          */
         function bp_get_activity_load_more_link() {
@@ -809 +808 @@
                  * Filters the Load More link URL.
                  *
-                 * @since BuddyPress (2.1.0)
+                 * @since 2.1.0
                  *
                  * @param string $link                The "Load More" link URL with appropriate query args.
@@ -821 +820 @@
  * Output the activity pagination count.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -833 +832 @@
          * Return the activity pagination count.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -860 +859 @@
  * Output the activity pagination links.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activity_pagination_links()
@@ -871 +870 @@
          * Return the activity pagination links.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -884 +883 @@
                  * Filters the activity pagination link output.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $pag_links Output for the activity pagination links.
@@ -894 +893 @@
  * Return true when there are more activity items to be shown than currently appear.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -919 +918 @@
          * Filters whether there are more activity items to display.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param bool $has_more_items Whether or not there are more activity items to display.
@@ -929 +928 @@
  * Output the activity count.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_count()
@@ -940 +939 @@
          * Return the activity count.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -953 +952 @@
                  * Filters the activity count for the activity template.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int $activity_count The count for total activity.
@@ -963 +962 @@
  * Output the number of activities per page.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_per_page()
@@ -974 +973 @@
          * Return the number of activities per page.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -987 +986 @@
                  * Filters the activity posts per page value.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int $pag_num How many post should be displayed for pagination.
@@ -997 +996 @@
  * Output the activities title.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activities_title()
@@ -1009 +1008 @@
          * Return the activities title.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global string $bp_activity_title
@@ -1023 +1022 @@
                  * Filters the activities title for the activity template.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $bp_activity_title The title to be displayed.
@@ -1033 +1032 @@
  * {@internal Missing Description}
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activities_no_activity()
@@ -1045 +1044 @@
          * {@internal Missing Description}
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global string $bp_activity_no_activity
@@ -1059 +1058 @@
                  * Filters the text used when there is no activity to display.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $bp_activity_no_activity Text to display for no activity.
@@ -1069 +1068 @@
  * Output the activity ID.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_id()
@@ -1080 +1079 @@
          * Return the activity ID.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1093 +1092 @@
                  * Filters the activity ID being displayed.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int $id The activity ID.
@@ -1103 +1102 @@
  * Output the activity item ID.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_item_id()
@@ -1114 +1113 @@
          * Return the activity item ID.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1127 +1126 @@
                  * Filters the activity item ID being displayed.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int $item_id The activity item ID.
@@ -1137 +1136 @@
  * Output the activity secondary item ID.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_secondary_item_id()
@@ -1148 +1147 @@
          * Return the activity secondary item ID.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1161 +1160 @@
                  * Filters the activity secondary item ID being displayed.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int $secondary_item_id The activity secondary item ID.
@@ -1171 +1170 @@
  * Output the date the activity was recorded.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_date_recorded()
@@ -1182 +1181 @@
          * Return the date the activity was recorded.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1195 +1194 @@
                  * Filters the date the activity was recorded.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int $date_recorded The activity's date.
@@ -1205 +1204 @@
  * Output the display name of the member who posted the activity.
  *
- * @since BuddyPress (2.1.0)
+ * @since 2.1.0
  *
  * @uses bp_get_activity_member_display_name()
@@ -1216 +1215 @@
          * Return the display name of the member who posted the activity.
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1233 +1232 @@
                  * Filters the display name of the member who posted the activity.
                  *
-                 * @since BuddyPress (2.1.0)
+                 * @since 2.1.0
                  *
                  * @param int $retval Display name for the member who posted.
@@ -1243 +1242 @@
  * Output the activity object name.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_object_name()
@@ -1254 +1253 @@
          * Return the activity object name.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1267 +1266 @@
                  * Filters the activity object name.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $activity_component The activity object name.
@@ -1277 +1276 @@
  * Output the activity type.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_type()
@@ -1288 +1287 @@
          * Return the activity type.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1301 +1300 @@
                  * Filters the activity type.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $activity_type The activity type.
@@ -1313 +1312 @@
          * Just a wrapper for bp_activity_type().
          *
-         * @since BuddyPress (1.2.0)
-         * @deprecated BuddyPress (1.5.0)
+         * @since 1.2.0
+         * @deprecated 1.5.0
          *
          * @todo Properly deprecate in favor of bp_activity_type() and
@@ -1328 +1327 @@
          * Just a wrapper for bp_get_activity_type().
          *
-         * @since BuddyPress (1.2.0)
-         * @deprecated BuddyPress (1.5.0)
+         * @since 1.2.0
+         * @deprecated 1.5.0
          *
          * @todo Properly deprecate in favor of bp_get_activity_type().
@@ -1342 +1341 @@
  * Output the activity user ID.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @uses bp_get_activity_user_id()
@@ -1353 +1352 @@
          * Return the activity user ID.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1366 +1365 @@
                  * Filters the activity user ID.
                  *
-                 * @since BuddyPress (1.1.0)
+                 * @since 1.1.0
                  *
                  * @param int $user_id The activity user ID.
@@ -1376 +1375 @@
  * Output the activity user link.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_user_link()
@@ -1387 +1386 @@
          * Return the activity user link.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1407 +1406 @@
                  * Filters the activity user link.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $link The activity user link.
@@ -1417 +1416 @@
  * Output the avatar of the user that performed the action.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @see bp_get_activity_avatar() for description of arguments.
@@ -1430 +1429 @@
          * Return the avatar of the user that performed the action.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @see bp_core_fetch_avatar() For a description of the arguments.
@@ -1509 +1508 @@
                  * bp_get_activity_avatar_object_group, and bp_get_activity_avatar_object_user.
                  *
-                 * @since BuddyPress (1.1.0)
+                 * @since 1.1.0
                  *
                  * @param string $component Component being displayed.
@@ -1519 +1518 @@
                  * Filters the activity avatar item ID.
                  *
-                 * @since BuddyPress (1.2.10)
+                 * @since 1.2.10
                  *
                  * @param int $item_id Item ID for the activity avatar.
@@ -1533 +1532 @@
                  * Filters the value returned by bp_core_fetch_avatar.
                  *
-                 * @since BuddyPress (1.1.3)
+                 * @since 1.1.3
                  *
                  * @param array $value Array of arguments calculated for use with bp_core_fetch_avatar.
@@ -1552 +1551 @@
  * Output the avatar of the object that action was performed on.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see bp_get_activity_secondary_avatar() for description of arguments.
@@ -1566 +1565 @@
          * Return the avatar of the object that action was performed on.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @see bp_core_fetch_avatar() for description of arguments.
@@ -1676 +1675 @@
                  * and bp_get_activity_secondary_avatar_object_user.
                  *
-                 * @since BuddyPress (1.2.10)
+                 * @since 1.2.10
                  *
                  * @param string $object Component being displayed.
@@ -1685 +1684 @@
                  * Filters the activity secondary avatar item ID.
                  *
-                 * @since BuddyPress (1.2.10)
+                 * @since 1.2.10
                  *
                  * @param int $item_id ID for the secondary avatar item.
@@ -1713 +1712 @@
                          * Filters the secondary avatar link for current activity.
                          *
-                         * @since BuddyPress (1.7.0)
+                         * @since 1.7.0
                          *
                          * @param string $link      Link to wrap the avatar image in.
@@ -1723 +1722 @@
                          * Filters the determined avatar for the secondary activity item.
                          *
-                         * @since BuddyPress (1.2.10)
+                         * @since 1.2.10
                          *
                          * @param string $avatar Formatted HTML <img> element, or raw avatar URL.
@@ -1743 +1742 @@
  * Output the activity action.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @param array $args See bp_get_activity_action()
@@ -1755 +1754 @@
          * Return the activity action.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1779 +1778 @@
                  * Filters the activity action before the action is inserted as meta.
                  *
-                 * @since BuddyPress (1.2.10)
+                 * @since 1.2.10
                  *
                  * @param array $value Array containing the current action, the current activity, and the $args array passed into the function.
@@ -1797 +1796 @@
                  * Filters the activity action after the action has been inserted as meta.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param array $value Array containing the current action, the current activity, and the $args array passed into the function.
@@ -1811 +1810 @@
  * Output the activity content body.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_content_body()
@@ -1822 +1821 @@
          * Return the activity content body.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -1841 +1840 @@
                  * Filters the activity content body.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param array $value Array containing the current activity content body and the current activity.
@@ -1851 +1850 @@
  * Does the activity have content?
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -1870 +1869 @@
  * Output the activity content.
  *
- * @since BuddyPress (1.0.0)
- * @deprecated BuddyPress (1.5.0)
+ * @since 1.0.0
+ * @deprecated 1.5.0
  *
  * @todo properly deprecate this function.
@@ -1884 +1883 @@
          * Return the activity content.
          *
-         * @since BuddyPress (1.0.0)
-         * @deprecated BuddyPress (1.5.0)
+         * @since 1.0.0
+         * @deprecated 1.5.0
          *
          * @todo properly deprecate this function.
@@ -1913 +1912 @@
  * as a link to the item's permalink).
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -1940 +1939 @@
          * Filters the activity item time since markup.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $value Array containing the time since markup and the current activity component.
@@ -1964 +1963 @@
                  * Filters the activity permalink to be added to the activity content.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param array $value Array containing the html markup for the activity permalink, after being parsed by sprintf and current activity component.
@@ -1979 +1978 @@
          * Filters the activity content after activity metadata has been attached.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param string $content Activity content with the activity metadata added.
@@ -1989 +1988 @@
  * Determine if the current user can delete an activity item.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -2038 +2037 @@
          * Filters whether the current user can delete an activity item.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param bool   $can_delete Whether the user can delete the item.
@@ -2049 +2048 @@
  * Output the activity parent content.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see bp_get_activity_parent_content() for a description of arguments.
@@ -2063 +2062 @@
          * Return the activity content.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2110 +2109 @@
                  * Filters the activity parent content.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $content Content set to be displayed as parent content.
@@ -2120 +2119 @@
  * Output the parent activity's user ID.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  */
 function bp_activity_parent_user_id() {
@@ -2129 +2128 @@
          * Return the parent activity's user ID.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          *
          * @global BP_Activity_Template $activities_template
@@ -2162 +2161 @@
                  * Filters the activity parent item's user ID.
                  *
-                 * @since BuddyPress (1.7.0)
+                 * @since 1.7.0
                  *
                  * @param int $retval ID for the activity parent's user.
@@ -2172 +2171 @@
  * Output whether or not the current activity is in a current user's favorites.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_is_favorite()
@@ -2183 +2182 @@
          * Return whether the current activity is in a current user's favorites.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2196 +2195 @@
                  * Filters whether the current activity item is in the current user's favorites.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param bool $value Whether or not the current activity item is in the current user's favorites.
@@ -2206 +2205 @@
  * Output the comment markup for an activity item.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @todo deprecate $args param
@@ -2219 +2218 @@
          * Get the comment markup for an activity item.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @todo deprecate $args param
@@ -2249 +2248 @@
                  * split between here and the comment.php template.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param object $comment The activity object currently being recursed.
@@ -2272 +2271 @@
                          * Filters the opening tag for the template that lists activity comments.
                          *
-                         * @since BuddyPress (1.6.0)
+                         * @since 1.6.0
                          *
                          * @param string $value Opening tag for the HTML markup to use.
@@ -2300 +2299 @@
                          * Filters the closing tag for the template that list activity comments.
                          *
-                         * @since BuddyPress (1.6.0)
+                         * @since  1.6.0
                          *
                          * @param string $value Closing tag for the HTML markup to use.
@@ -2310 +2309 @@
  * Utility function that returns the comment currently being recursed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -2328 +2327 @@
          * Filters the current comment being recursed.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param object|bool $current_comment The activity comment currently being displayed. False on failure.
@@ -2339 +2338 @@
  * Output the ID of the activity comment currently being displayed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_comment_id()
@@ -2350 +2349 @@
          * Return the ID of the activity comment currently being displayed.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2366 +2365 @@
                  * Filters the ID of the activity comment currently being displayed.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param int|bool $comment_id ID for the comment currently being displayed.
@@ -2376 +2375 @@
  * Output the ID of the author of the activity comment currently being displayed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_comment_user_id()
@@ -2387 +2386 @@
          * Return the ID of the author of the activity comment currently being displayed.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2403 +2402 @@
                  * Filters the ID of the author of the activity comment currently being displayed.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param int|bool $user_id ID for the author of the comment currently being displayed.
@@ -2413 +2412 @@
  * Output the author link for the activity comment currently being displayed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_comment_user_link()
@@ -2424 +2423 @@
          * Return the author link for the activity comment currently being displayed.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @uses bp_core_get_user_domain()
@@ -2438 +2437 @@
                  * Filters the author link for the activity comment currently being displayed.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $user_link Link for the author of the activity comment currently being displayed.
@@ -2448 +2447 @@
  * Output the author name for the activity comment currently being displayed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_comment_name()
@@ -2462 +2461 @@
          * 'bp_activity_comment_name'.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2483 +2482 @@
                  * Filters the name of the author for the activity comment.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $name Name to be displayed with the activity comment.
@@ -2493 +2492 @@
  * Output the formatted date_recorded of the activity comment currently being displayed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_comment_date_recorded()
@@ -2504 +2503 @@
          * Return the formatted date_recorded for the activity comment currently being displayed.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @uses bp_core_time_since()
@@ -2517 +2516 @@
                  * Filters the recorded date of the activity comment currently being displayed.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string|bool Date for the activity comment currently being displayed.
@@ -2527 +2526 @@
  * Output the date_recorded of the activity comment currently being displayed.
  *
- * @since BuddyPress (2.3.0)
+ * @since 2.3.0
  *
  * @uses bp_get_activity_comment_date_recorded()
@@ -2538 +2537 @@
          * Return the date_recorded for the activity comment currently being displayed.
          *
-         * @since BuddyPress (2.3.0)
+         * @since 2.3.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2553 +2552 @@
                  * Filters the raw recorded date of the activity comment currently being displayed.
                  *
-                 * @since BuddyPress (2.3.0)
+                 * @since 2.3.0
                  *
                  * @param string|bool Raw date for the activity comment currently being displayed.
@@ -2563 +2562 @@
  * Output the 'delete' URL for the activity comment currently being displayed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_comment_delete_link()
@@ -2574 +2573 @@
          * Gets the 'delete' URL for the activity comment currently being displayed.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @uses wp_nonce_url()
@@ -2591 +2590 @@
                  * Filters the link used for deleting the activity comment currently being displayed.
                  *
-                 * @since BuddyPress (1.5.0)
+                 * @since 1.5.0
                  *
                  * @param string $link Link to use for deleting the currently displayed activity comment.
@@ -2601 +2600 @@
  * Output the content of the activity comment currently being displayed.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bp_get_activity_comment_content()
@@ -2617 +2616 @@
          * comments only.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2634 +2633 @@
                  * Filters the content of the current activity comment.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $content The content of the current activity comment.
@@ -2644 +2643 @@
  * Output the activity comment count.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_activity_get_comment_count()
@@ -2655 +2654 @@
          * Return the comment count of an activity item.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2681 +2680 @@
                  * Filters the activity comment count.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int $count The activity comment count.
@@ -2694 +2693 @@
                  * activity child has, and returns them.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @uses bp_activity_recurse_comment_count()
@@ -2720 +2719 @@
                          * Filters the total number of comments for the current comment.
                          *
-                         * @since BuddyPress (2.1.0)
+                         * @since 2.1.0
                          *
                          * @param int    $new_count New total count for the current comment.
@@ -2732 +2731 @@
  * Output the depth of the current activity comment.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  */
 function bp_activity_comment_depth() {
@@ -2740 +2739 @@
          * Return the current activity comment depth.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @return int $depth Depth for the current activity comment.
@@ -2750 +2749 @@
                  * Filters the comment depth of the current activity comment.
                  *
-                 * @since BuddyPress (2.0.0)
+                 * @since 2.0.0
                  *
                  * @param int $depth Depth for the current activity comment.
@@ -2760 +2759 @@
  * Output the activity comment link.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_comment_link()
@@ -2771 +2770 @@
          * Return the activity comment link.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2784 +2783 @@
                  * Filters the comment link for the current activity comment.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value Constructed URL parameters with activity IDs.
@@ -2794 +2793 @@
  * Output the activity comment form no JavaScript display CSS.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_comment_form_nojs_display()
@@ -2805 +2804 @@
          * Return the activity comment form no JavaScript display CSS.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -2825 +2824 @@
  * Output the activity comment form action.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_comment_form_action()
@@ -2836 +2835 @@
          * Return the activity comment form action.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses home_url()
@@ -2849 +2848 @@
                  * Filters the activity comment form action URL.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value URL to use in the comment form's action attribute.
@@ -2859 +2858 @@
  * Output the activity permalink ID.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_permalink_id()
@@ -2870 +2869 @@
          * Return the activity permalink ID.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses apply_filters() To call the 'bp_get_activity_permalink_id' hook.
@@ -2881 +2880 @@
                  * Filters the activity action permalink ID.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value Current action for the activity item.
@@ -2891 +2890 @@
  * Output the activity thread permalink.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_permalink_id()
@@ -2902 +2901 @@
          * Return the activity thread permalink.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses bp_activity_get_permalink()
@@ -2917 +2916 @@
                  * Filters the activity thread permalink.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $link The activity thread permalink.
@@ -2927 +2926 @@
  * Output the activity comment permalink.
  *
- * @since BuddyPress (1.8.0)
+ * @since 1.8.0
  *
  * @uses bp_get_activity_permalink_id()
@@ -2937 +2936 @@
          * Return the activity comment permalink.
          *
-         * @since BuddyPress (1.8.0)
+         * @since 1.8.0
          *
          * @uses bp_activity_get_permalink()
@@ -2963 +2962 @@
                  * Filters the activity comment permalink.
                  *
-                 * @since BuddyPress (1.8.0)
+                 * @since 1.8.0
                  *
                  * @param string $link       Activity comment permalink.
@@ -2974 +2973 @@
  * Output the activity favorite link.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_favorite_link()
@@ -2985 +2984 @@
          * Return the activity favorite link.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -3001 +3000 @@
                  * Filters the activity favorite link.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value Constructed link for favoriting the activity comment.
@@ -3011 +3010 @@
  * Output the activity unfavorite link.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_unfavorite_link()
@@ -3022 +3021 @@
          * Return the activity unfavorite link.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -3038 +3037 @@
                  * Filters the activity unfavorite link.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value Constructed link for unfavoriting the activity comment.
@@ -3048 +3047 @@
  * Output the activity CSS class.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activity_css_class()
@@ -3059 +3058 @@
          * Return the current activity item's CSS class.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -3075 +3074 @@
                  * Filters the available mini activity actions available as CSS classes.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param array $value Array of classes used to determine classes applied to HTML element.
@@ -3101 +3100 @@
                  * Filters the determined classes to add to the HTML element.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $value Classes to be added to the HTML element.
@@ -3111 +3110 @@
  * Output the activity delete link.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @uses bp_get_activity_delete_link()
@@ -3122 +3121 @@
          * Return the activity delete link.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -3151 +3150 @@
                  * Filters the activity delete link.
                  *
-                 * @since BuddyPress (1.1.0)
+                 * @since 1.1.0
                  *
                  * @param string $link Activity delete HTML link.
@@ -3161 +3160 @@
  * Output the URL to delete a single activity stream item.
  *
- * @since BuddyPress (2.1.0)
+ * @since 2.1.0
  *
  * @uses bp_get_activity_delete_link()
@@ -3171 +3170 @@
          * Return the URL to delete a single activity item.
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -3201 +3200 @@
                  * Filters the activity delete URL.
                  *
-                 * @since BuddyPress (2.1.0)
+                 * @since 2.1.0
                  *
                  * @param string $url Activity delete URL.
@@ -3211 +3210 @@
  * Output the activity latest update link.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see bp_get_activity_latest_update() for description of parameters.
@@ -3225 +3224 @@
          * Return the activity latest update link.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses bp_is_user_inactive()
@@ -3258 +3257 @@
                  * Filters the latest update excerpt.
                  *
-                 * @since BuddyPress (1.2.10)
+                 * @since 1.2.10
                  *
                  * @param string $value The excerpt for the latest update.
@@ -3274 +3273 @@
                  * Filters the latest update excerpt with view link appended to the end.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $latest_update The latest update with "view" link appended to it.
@@ -3284 +3283 @@
  * Output the activity filter links.
  *
- * @since BuddyPress (1.1.0)
+ * @since 1.1.0
  *
  * @see bp_get_activity_filter_links() for description of parameters.
@@ -3298 +3297 @@
          * Return the activity filter links.
          *
-         * @since BuddyPress (1.1.0)
+         * @since 1.1.0
          *
          * @uses wp_parse_args()
@@ -3370 +3369 @@
                          * Filters the activity filter link URL for the current activity component.
                          *
-                         * @since BuddyPress (1.1.0)
+                         * @since 1.1.0
                          *
                          * @param string $link      The URL for the current component.
@@ -3389 +3388 @@
                  * Filters all of the constructed filter links.
                  *
-                 * @since BuddyPress (1.1.0)
+                 * @since 1.1.0
                  *
                  * @param string $value All of the links to be displayed to the user.
@@ -3399 +3398 @@
  * Determine if a comment can be made on an activity item.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @global object $activities_template {@link BP_Activity_Template}
@@ -3447 +3446 @@
          * Filters whether a comment can be made on an activity item.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param bool   $can_comment     Status on if activity can be commented on.
@@ -3458 +3457 @@
  * Determine whether a comment can be made on an activity reply item.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @param  bool|object $comment     Activity comment.
@@ -3494 +3493 @@
          * Filters whether a comment can be made on an activity reply item.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param bool   $can_comment Status on if activity reply can be commented on.
@@ -3507 +3506 @@
  * Defaults to true, but can be modified by plugins.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses apply_filters() To call the 'bp_activity_can_favorite' hook.
@@ -3518 +3517 @@
          * Filters whether or not users can favorite activity items.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param bool $value Whether or not favoriting is enabled.
@@ -3528 +3527 @@
  * Output the total favorite count for a specified user.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see bp_get_total_favorite_count_for_user() for description of parameters.
@@ -3542 +3541 @@
          * Return the total favorite count for a specified user.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses bp_activity_total_favorites_for_user()
@@ -3569 +3568 @@
                  * Filters the total favorite count for a user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int|bool $retval Total favorite count for a user. False on no favorites.
@@ -3580 +3579 @@
  * Output the total mention count for a specified user.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see bp_get_total_mention_count_for_user() for description of parameters.
@@ -3594 +3593 @@
          * Return the total mention count for a specified user.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses bp_get_user_meta()
@@ -3618 +3617 @@
                  * Filters the total mention count for a user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param int|bool $retval Total mention count for a user. False on no mentions.
@@ -3628 +3627 @@
  * Output the public message link for displayed user.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_send_public_message_link()
@@ -3639 +3638 @@
          * Return the public message link for the displayed user.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses is_user_logged_in()
@@ -3664 +3663 @@
                  * Filters the public message link for the displayed user.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $retval The URL for the public message link.
@@ -3674 +3673 @@
  * Recurse through all activity comments and return the activity comment IDs.
  *
- * @since BuddyPress (2.0.0)
+ * @since 2.0.0
  *
  * @param array $activity Array of activities generated from {@link bp_activity_get()}.
@@ -3702 +3701 @@
  * Output the mentioned user display name.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see bp_get_mentioned_user_display_name() for description of parameters.
@@ -3716 +3715 @@
          * Returns the mentioned user display name.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses bp_core_get_user_displayname()
@@ -3738 +3737 @@
                  * Filters the mentioned user display name.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string     $name                Display name for the mentioned user.
@@ -3749 +3748 @@
  * Output button for sending a public message (an @-mention).
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @see bp_get_send_public_message_button() for description of parameters.
@@ -3763 +3762 @@
          * Return button for sending a public message (an @-mention).
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses bp_get_send_public_message_link()
@@ -3804 +3803 @@
                  * Filters the public message button HTML.
                  *
-                 * @since BuddyPress (1.2.10)
+                 * @since 1.2.10
                  *
                  * @param array $r Array of arguments for the public message button HTML.
@@ -3814 +3813 @@
  * Output the activity post form action.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_activity_post_form_action()
@@ -3825 +3824 @@
          * Return the activity post form action.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses home_url()
@@ -3838 +3837 @@
                  * Filters the action url used for the activity post form.
                  *
-                 * @since BuddyPress (1.2.0)
+                 * @since 1.2.0
                  *
                  * @param string $value URL to be used for the activity post form.
@@ -3853 +3852 @@
  * <ul> or <ol> wrapper markup.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  *
  * @see bp_core_fetch_avatar() for a description of arguments.
@@ -3908 +3907 @@
          * Filters the list of linked avatars for users who have commented on the current activity item.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          *
          * @param string $retval HTML markup for the list of avatars.
@@ -3920 +3919 @@
  * Return the IDs of every user who's left a comment on the current activity item.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  *
  * @return bool|array An array of IDs, or false if none are found.
@@ -3934 +3933 @@
          * Filters the list of user IDs for the current activity item.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          *
          * @param array $value Array of unique user IDs for the current activity item.
@@ -3944 +3943 @@
          * Recurse through all activity comments and collect the IDs of the users who wrote them.
          *
-         * @since BuddyPress (1.7.0)
+         * @since 1.7.0
          *
          * @param array $comments Array of {@link BP_Activity_Activity} items.
@@ -3978 +3977 @@
                  * Filters the list of user IDs for the current activity comment item.
                  *
-                 * @since BuddyPress (2.1.0)
+                 * @since 2.1.0
                  *
                  * @param array $user_ids Array of user IDs for the current activity comment item.
@@ -3989 +3988 @@
  * Output the mentionname for the displayed user.
  *
- * @since BuddyPress (1.9.0)
+ * @since 1.9.0
  */
 function bp_displayed_user_mentionname() {
@@ -3997 +3996 @@
          * Get the mentionname for the displayed user.
          *
-         * @since BuddyPress (1.9.0)
+         * @since 1.9.0
          *
          * @return string Mentionname for the displayed user, if available.
@@ -4006 +4005 @@
                  * Filters the mentionname for the displayed user.
                  *
-                 * @since BuddyPress (1.9.0)
+                 * @since 1.9.0
                  *
                  * @param string $value The mentionanme for the displayed user.
@@ -4016 +4015 @@
  * Echo a list of all registered activity types for use in dropdowns or checkbox lists.
  *
- * @since BuddyPress (1.7.0)
+ * @since 1.7.0
  *
  * @param string       $output Optional. Either 'select' or 'checkbox'. Default: 'select'.
@@ -4060 +4059 @@
                  * Two default hooks are bp_activity_types_list_select and bp_activity_types_list_checkbox.
                  *
-                 * @since BuddyPress (1.7.0)
+                 * @since 1.7.0
                  *
                  * @param array  $args        Array of arguments passed into function.
@@ -4081 +4080 @@
  * Output the sitewide activity feed link.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_sitewide_activity_feed_link()
@@ -4092 +4091 @@
          * Returns the sitewide activity feed link.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @uses home_url()
@@ -4105 +4104 @@
                  * Filters the sidewide activity feed link.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $value The feed link for sitewide activity.
@@ -4115 +4114 @@
  * Output the member activity feed link.
  *
- * @since BuddyPress (1.2.0)
+ * @since 1.2.0
  *
  * @uses bp_get_member_activity_feed_link()
@@ -4126 +4125 @@
  * Output the member activity feed link.
  *
- * @since BuddyPress (1.0.0)
- * @deprecated BuddyPress (1.2.0)
+ * @since 1.0.0
+ * @deprecated 1.2.0
  *
  * @todo properly deprecate in favor of bp_member_activity_feed_link().
@@ -4138 +4137 @@
          * Return the member activity feed link.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @uses bp_is_profile_component()
@@ -4181 +4180 @@
                  * Filters the member activity feed link.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $link URL for the member activity feed.
@@ -4191 +4190 @@
          * Return the member activity feed link.
          *
-         * @since BuddyPress (1.0.0)
-         * @deprecated BuddyPress (1.2.0)
+         * @since 1.0.0
+         * @deprecated 1.2.0
          *
          * @todo properly deprecate in favor of bp_get_member_activity_feed_link().
@@ -4208 +4207 @@
  * Outputs the activity feed item guid.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_activity_feed_item_guid()
@@ -4219 +4218 @@
          * Returns the activity feed item guid.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -4232 +4231 @@
                  * Filters the activity feed item guid.
                  *
-                 * @since BuddyPress (1.1.3)
+                 * @since 1.1.3
                  *
                  * @param string $value Calculated md5 value for the activity feed item.
@@ -4242 +4241 @@
  * Output the activity feed item title.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activity_feed_item_title()
@@ -4253 +4252 @@
          * Return the activity feed item title.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -4286 +4285 @@
                  * Filters the activity feed item title.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $title The title for the activity feed item.
@@ -4296 +4295 @@
  * Output the activity feed item link.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activity_feed_item_link()
@@ -4307 +4306 @@
          * Return the activity feed item link.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -4324 +4323 @@
                  * Filters the activity feed item link.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $retval The URL for the activity feed item.
@@ -4334 +4333 @@
  * Output the activity feed item date.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activity_feed_item_date()
@@ -4345 +4344 @@
          * Return the activity feed item date.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -4362 +4361 @@
                  * Filters the activity feed item date.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $retval The date for the activity feed item.
@@ -4372 +4371 @@
  * Output the activity feed item description.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  *
  * @uses bp_get_activity_feed_item_description()
@@ -4383 +4382 @@
          * Return the activity feed item description.
          *
-         * @since BuddyPress (1.0.0)
+         * @since 1.0.0
          *
          * @global object $activities_template {@link BP_Activity_Template}
@@ -4408 +4407 @@
                  * Filters the activity feed item description.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param string $content The description for the activity feed item.
@@ -4418 +4417 @@
  * Template tag so we can hook activity feed to <head>.
  *
- * @since BuddyPress (1.5.0)
+ * @since 1.5.0
  *
  * @uses bloginfo()
@@ -4435 +4434 @@
  * Display available filters depending on the scope.
  *
- * @since BuddyPress (2.1.0)
+ * @since 2.1.0
  *
  * @param string $context The current context. 'activity', 'member',
@@ -4447 +4446 @@
          * Get available filters depending on the scope.
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          *
          * @param string $context The current context. 'activity', 'member',
@@ -4499 +4498 @@
                  * Filters the options available in the activity filter dropdown.
                  *
-                 * @since BuddyPress (2.2.0)
+                 * @since 2.2.0
                  *
                  * @param array  $filters Array of filter options for the given context, in the following format: $option_value => $option_name.
@@ -4518 +4517 @@
                  * Filters the HTML markup result for the activity filter dropdown.
                  *
-                 * @since BuddyPress (2.1.0)
+                 * @since 2.1.0
                  *
                  * @param string $output  HTML output for the activity filter dropdown.

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

@@ -16 +16 @@
  * static methods for querying activities.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
  */
 class BP_Activity_Activity {
@@ -210 +210 @@
                  * Please use this hook to filter the properties above. Each part will be passed in.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param BP_Activity_Activity $this Current instance of the activity item being saved. Passed by reference.
@@ -247 +247 @@
                  * Fires after an activity item has been saved to the database.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  *
                  * @param BP_Activity_Activity $this Current instance of activity item being saved. Passed by reference.
@@ -457 +457 @@
                  * Filters the MySQL WHERE conditions for the Activity items get method.
                  *
-                 * @since BuddyPress (1.9.0)
+                 * @since 1.9.0
                  *
                  * @param array  $where_conditions Current conditions for MySQL WHERE statement.
@@ -473 +473 @@
                  * Filters the preferred order of indexes for activity item.
                  *
-                 * @since BuddyPress (1.6.0)
+                 * @since 1.6.0
                  *
                  * @param array Array of indexes in preferred order.
@@ -507 +507 @@
                  * It is not recommended to use the legacy structure, but allowed to if needed.
                  *
-                 * @since BuddyPress (2.0.0)
+                 * @since 2.0.0
                  *
                  * @param bool                 $value Whether to use legacy structure or not.
@@ -530 +530 @@
                                  * Filters the legacy MySQL query statement so plugins can alter before results are fetched.
                                  *
-                                 * @since BuddyPress (1.5.0)
+                                 * @since 1.5.0
                                  *
                                  * @param string $value      Concatenated MySQL statement pieces to be query results with for legacy query.
@@ -554 +554 @@
                          * Filters the paged activities MySQL statement.
                          *
-                         * @since BuddyPress (2.0.0)
+                         * @since 2.0.0
                          *
                          * @param string $activity_ids_sql MySQL statement used to query for Activity IDs.
@@ -605 +605 @@
                          * Filters the total activities MySQL statement.
                          *
-                         * @since BuddyPress (1.5.0)
+                         * @since 1.5.0
                          *
                          * @param string $value     MySQL statement used to query for total activities.
@@ -629 +629 @@
          * Convert activity IDs to activity objects, as expected in template loop.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param array $activity_ids Array of activity IDs.
@@ -694 +694 @@
          * Append xProfile fullnames to an activity array.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param array $activities Activities array.
@@ -735 +735 @@
          * their own caches at the beginning of an activity loop.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param array $activities Array of activities.
@@ -746 +746 @@
                  * Filters inside prefetch_object_data method to aid in pre-fetching object data associated with activity item.
                  *
-                 * @since BuddyPress (2.0.0)
+                 * @since 2.0.0
                  *
                  * @param array $activities Array of activities.
@@ -761 +761 @@
          * be left in place.
          *
-         * @since BuddyPress (2.0.0)
+         * @since 2.0.0
          *
          * @param array $activities Array of activities.
@@ -789 +789 @@
          * AND keyword from the 'where' clause).
          *
-         * @since BuddyPress (1.8.0)
+         * @since 1.8.0
          *
          * @param array $meta_query An array of meta_query filters. See the
@@ -830 +830 @@
          * keyword from the query).
          *
-         * @since BuddyPress (2.1.0)
+         * @since 2.1.0
          *
          * @param array $date_query An array of date_query parameters. See the
@@ -857 +857 @@
          * Can handle multiple scopes.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param  mixed $scope  The activity scope. Accepts string or array of scopes.
@@ -906 +906 @@
                          *   - bp_friends_filter_activity_scope() - used for 'friends' scope
                          *
-                         * @since BuddyPress (2.2.0)
+                         * @since 2.2.0
                          *
                          *  @param array {
@@ -959 +959 @@
          * As of 1.5.x, use BP_Activity_Activity::get() with an 'in' parameter instead.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @deprecated 1.5
@@ -1047 +1047 @@
          * Otherwise use the filters.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $args {
@@ -1155 +1155 @@
                  * Action to allow intercepting activity items to be deleted.
                  *
-                 * @since BuddyPress (2.3.0)
+                 * @since 2.3.0
                  *
                  * @param array $activities Array of activities.
@@ -1173 +1173 @@
                  * Action to allow intercepting activity items just deleted.
                  *
-                 * @since BuddyPress (2.3.0)
+                 * @since 2.3.0
                  *
                  * @param array $activities Array of activities.
@@ -1222 +1222 @@
          * use it going forward, and use BP_Activity_Activity::delete() instead.
          *
-         * @since BuddyPress (1.2.0)
-         * @deprecated BuddyPress (2.3.0)
+         * @since 1.2.0
+         * @deprecated 2.3.0
          *
          * @param array $activity_ids Activity IDs whose comments should be deleted.
@@ -1253 +1253 @@
          * Delete the meta entries associated with a set of activity items.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param array $activity_ids Activity IDs whose meta should be deleted.
@@ -1272 +1272 @@
          * Append activity comments to their associated activity items.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global wpdb $wpdb WordPress database object.
@@ -1303 +1303 @@
          * Get activity comments that are associated with a specific activity ID.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global wpdb $wpdb WordPress database object.
@@ -1360 +1360 @@
                          * Filters if BuddyPress should use the legacy activity query.
                          *
-                         * @since BuddyPress (2.0.0)
+                         * @since 2.0.0
                          *
                          * @param bool                 $value     Whether or not to use the legacy query.
@@ -1371 +1371 @@
                                  * Filters the MySQL prepared statement for the legacy activity query.
                                  *
-                                 * @since BuddyPress (1.5.0)
+                                 * @since 1.5.0
                                  *
                                  * @param string $value       Prepared statement for the activity query.
@@ -1463 +1463 @@
          * Rebuild nested comment tree under an activity or activity comment.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global wpdb $wpdb WordPress database object.
@@ -1503 +1503 @@
          * Get child comments of an activity or activity comment.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @global wpdb $wpdb WordPress database object.
@@ -1569 +1569 @@
          * Create SQL IN clause for filter queries.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @see BP_Activity_Activity::get_filter_sql()
@@ -1607 +1607 @@
          * Create filter SQL clauses.
          *
-         * @since BuddyPress (1.5.0)
+         * @since 1.5.0
          *
          * @param array $filter_array {
@@ -1687 +1687 @@
          * Get the date/time of last recorded activity.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @return string ISO timestamp.
@@ -1702 +1702 @@
          * Get favorite count for a given user.
          *
-         * @since BuddyPress (1.2.0)
+         * @since 1.2.0
          *
          * @param int $user_id The ID of the user whose favorites you're counting.
@@ -1762 +1762 @@
          * Subject to removal once WordPress makes PHP 5.3.0 the minimum requirement.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @see http://php.net/manual/en/function.array-replace-recursive.php#109390

trunk/src/bp-activity/classes/class-bp-activity-feed.php

@@ -4 +4 @@
  *
  * @package BuddyPress
- * @subpackage Activity
+ * @subpackage ActivityFeeds
  */
 
@@ -31 +31 @@
  *   @type array  $activity_args    Optional. Arguments passed to {@link bp_has_activities()}
  * }
- * @since BuddyPress (1.8.0)
+ * @since 1.8.0
  */
 class BP_Activity_Feed {
@@ -74 +74 @@
                  * Filters if BuddyPress should consider feeds enabled. If disabled, it will return early.
                  *
-                 * @since BuddyPress (1.8.0)
+                 * @since 1.8.0
                  *
                  * @param bool true Default true aka feeds are enabled.
@@ -126 +126 @@
                  * Fires before the feed is setup so plugins can modify.
                  *
-                 * @since BuddyPress (1.8.0)
+                 * @since 1.8.0
                  *
                  * @param BP_Activity_Feed $this Current instance of activity feed. Passed by reference.
@@ -144 +144 @@
                  * Fires after the feed is setup so plugins can modify.
                  *
-                 * @since BuddyPress (1.8.0)
+                 * @since 1.8.0
                  *
                  * @param BP_Activity_Feed $this Current instance of activity feed. Passed by reference.
@@ -210 +210 @@
                  * This hook was originally separated out for individual components but has since been abstracted into the BP_Activity_Feed class.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  */
                 do_action( 'bp_activity_' . $this->id . '_feed' );
@@ -225 +225 @@
                  * This hook was originally separated out for individual components but has since been abstracted into the BP_Activity_Feed class.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  */
                 do_action( 'bp_activity_' . $this->id . '_feed_head' );
@@ -254 +254 @@
                  * This hook was originally separated out for individual components but has since been abstracted into the BP_Activity_Feed class.
                  *
-                 * @since BuddyPress (1.0.0)
+                 * @since 1.0.0
                  */
                 do_action( 'bp_activity_' . $id . '_feed_item' );
@@ -293 +293 @@
          * Most of this class method is derived from {@link WP::send_headers()}.
          *
-         * @since BuddyPress (1.9.0)
+         * @since 1.9.0
          *
          * @access protected
@@ -388 +388 @@
          * Fires at the end of the opening RSS tag for feed output so plugins can add extra attributes.
          *
-         * @since BuddyPress (1.8.0)
+         * @since 1.8.0
          */
         do_action( 'bp_activity_feed_rss_attributes' ); ?>
@@ -409 +409 @@
          * Fires at the end of channel elements list in RSS feed so plugins can add extra channel elements.
          *
-         * @since BuddyPress (1.8.0)
+         * @since 1.8.0
          */
         do_action( 'bp_activity_feed_channel_elements' ); ?>
@@ -434 +434 @@
                                  * Fires at the end of the individual RSS Item list in RSS feed so plugins can add extra item elements.
                                  *
-                                 * @since BuddyPress (1.8.0)
+                                 * @since 1.8.0
                                  */
                                 do_action( 'bp_activity_feed_item_elements' ); ?>

trunk/src/bp-activity/classes/class-bp-activity-query.php

@@ -4 +4 @@
  *
  * @package BuddyPress
- * @subpackage Activity
+ * @subpackage ActivityQuery
  */
 
@@ -16 +16 @@
  * 'filter_query' parameter.
  *
- * @since BuddyPress (2.2.0)
+ * @since 2.2.0
  */
 class BP_Activity_Query extends BP_Recursive_Query {
@@ -24 +24 @@
          * See {@see BP_Activity_Query::__construct()} for information on query arguments.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          * @access public
          * @var array
@@ -33 +33 @@
          * Table alias.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          * @access public
          * @var string
@@ -44 +44 @@
          * See the 'wp_bp_activity' DB table schema.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          * @access public
          * @var array
@@ -56 +56 @@
          * Constructor.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          *
          * @param array $query {
@@ -87 +87 @@
          * Generates WHERE SQL clause to be appended to a main query.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          * @access public
          *
@@ -112 +112 @@
          * Generate WHERE clauses for a first-order clause.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          * @access protected
          *
@@ -225 +225 @@
          * Determine whether a clause is first-order.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          * @access protected
          *
@@ -242 +242 @@
          * See {@link BP_Activity_Query::db_tables}.
          *
-         * @since BuddyPress (2.2.0)
+         * @since 2.2.0
          * @access public
          *