![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 9834
- Timestamp:
- 05/03/2015 10:51:31 PM (11 years ago)
- Location:
- trunk/src/bp-activity
- Files:
-
- 11 edited
-
bp-activity-admin.php (modified) (5 diffs)
-
bp-activity-akismet.php (modified) (1 diff)
-
bp-activity-filters.php (modified) (8 diffs)
-
bp-activity-functions.php (modified) (14 diffs)
-
bp-activity-loader.php (modified) (2 diffs)
-
bp-activity-notifications.php (modified) (3 diffs)
-
bp-activity-screens.php (modified) (5 diffs)
-
bp-activity-template.php (modified) (37 diffs)
-
classes/class-bp-activity-activity.php (modified) (11 diffs)
-
classes/class-bp-activity-feed.php (modified) (2 diffs)
-
classes/class-bp-activity-query.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-admin.php
r9833 r9834 54 54 * @param array $custom_menus The list of top-level BP menu items. 55 55 * 56 * @return array $custom_menus List of top-level BP menu items, with Activity added 56 * @return array $custom_menus List of top-level BP menu items, with Activity added. 57 57 */ 58 58 function bp_activity_admin_menu_order( $custom_menus = array() ) { … … 192 192 * Does the following: 193 193 * - Register contextual help and screen options for this admin page. 194 * - Enqueues scripts and styles 195 * - Catches POST and GET requests related to Activity 194 * - Enqueues scripts and styles. 195 * - Catches POST and GET requests related to Activity. 196 196 * 197 197 * @since BuddyPress (1.6.0) … … 820 820 821 821 /** 822 * Activity type metabox for the Activity admin edit screen 822 * Activity type metabox for the Activity admin edit screen. 823 823 * 824 824 * @since BuddyPress (1.6.0) … … 1055 1055 1056 1056 /** 1057 * If users can comment on blog & forum activity items 1057 * If users can comment on blog & forum activity items. 1058 1058 * 1059 1059 * @since BuddyPress (2.2.2) … … 1642 1642 * 1643 1643 * This method merges functionality from {@link bp_activity_can_comment()} and 1644 * {@link bp_blogs_disable_activity_commenting()}. 1644 * {@link bp_blogs_disable_activity_commenting()}. This is done because the activity 1645 1645 * list table doesn't use a BuddyPress activity loop, which prevents those 1646 1646 * functions from working as intended. -
trunk/src/bp-activity/bp-activity-akismet.php
r9833 r9834 665 665 666 666 /** 667 * Delete old spam activity meta data 667 * Delete old spam activity meta data. 668 668 * 669 669 * This is done as a clean-up mechanism, as _bp_akismet_submission meta can -
trunk/src/bp-activity/bp-activity-filters.php
r9833 r9834 211 211 * @since BuddyPress (1.2.0) 212 212 * 213 * @param array Array of allowed HTML tags and attributes.213 * @param array $value Array of allowed HTML tags and attributes. 214 214 */ 215 215 $activity_allowedtags = apply_filters( 'bp_activity_allowed_tags', $activity_allowedtags ); … … 321 321 * @uses bp_activity_update_mention_count_for_user() 322 322 * 323 * @param BP_Activity_Activity $activity The BP_Activity_Activity object 323 * @param BP_Activity_Activity $activity The BP_Activity_Activity object. 324 324 */ 325 325 function bp_activity_at_name_send_emails( $activity ) { … … 379 379 * @param array $matches Items matched by preg_replace_callback() in bp_activity_make_nofollow_filter(). 380 380 * 381 * @return string $text Link with rel=nofollow added 381 * @return string $text Link with rel=nofollow added. 382 382 */ 383 383 function bp_activity_make_nofollow_filter_callback( $matches ) { … … 431 431 * @since BuddyPress (1.5.0) 432 432 * 433 * @param string $ read_more Internationalized "Read more" text.433 * @param string $value Internationalized "Read more" text. 434 434 */ 435 435 $append_text = apply_filters( 'bp_activity_excerpt_append_text', __( '[Read more]', 'buddypress' ) ); … … 440 440 * @since BuddyPress (1.5.0) 441 441 * 442 * @param int $ excerpt_lengthNumber indicating how many words to trim the excerpt down to.442 * @param int $value Number indicating how many words to trim the excerpt down to. 443 443 */ 444 444 $excerpt_length = apply_filters( 'bp_activity_excerpt_length', 358 ); … … 544 544 * @since BuddyPress (2.0.0) 545 545 * 546 * @uses bp_activity_get_last_updated() to get the recorded date of the last activity 546 * @uses bp_activity_get_last_updated() to get the recorded date of the last activity. 547 547 * 548 548 * @param array $response … … 626 626 * @since BuddyPress (2.0.0) 627 627 * 628 * @param array $ settingsHeartbeat settings array.628 * @param array $value Heartbeat settings array. 629 629 */ 630 630 $heartbeat_settings = apply_filters( 'heartbeat_settings', array() ); … … 639 639 * @since BuddyPress (2.0.0) 640 640 * 641 * @param int $ frequencyThe frequency in seconds between pulses.641 * @param int $value The frequency in seconds between pulses. 642 642 */ 643 643 $bp_activity_pulse = apply_filters( 'bp_activity_heartbeat_pulse', 15 ); -
trunk/src/bp-activity/bp-activity-functions.php
r9833 r9834 29 29 * The Mentions feature does a number of things, all of which will be turned 30 30 * off if you disable mentions: 31 * - Detecting and auto-linking @username in all BP/WP content 31 * - Detecting and auto-linking @username in all BP/WP content. 32 32 * - Sending BP notifications and emails to users when they are mentioned 33 * using the @username syntax 34 * - The Public Message button on user profiles 33 * using the @username syntax. 34 * - The Public Message button on user profiles. 35 35 * 36 36 * Mentions are enabled by default. To disable, put the following line in … … 269 269 * 270 270 * @since BuddyPress (1.9.0) 271 * 272 * @param string $mentionname Username of user in @-mentions. 271 273 * 272 274 * @return int|bool ID of the user, if one is found. Otherwise false. … … 329 331 * @param string|bool $label String to describe this action in the activity stream filter dropdown. 330 332 * @param array $context Optional. Activity stream contexts where the filter should appear. 331 * Values: 'activity', 'member', 'member_groups', 'group' 333 * Values: 'activity', 'member', 'member_groups', 'group'. 332 334 * @param int $position Optional. The position of the action when listed in dropdowns. 333 335 * … … 407 409 * Default: 'bp_activity_format_activity_action_custom_post_type_post'. 408 410 * @type array $contexts The directory contexts in which the filter will show. 409 * Default: array( 'activity' ) ,411 * Default: array( 'activity' ). 410 412 * @type array $position Position of the item in filter dropdowns. 411 413 * @type string $singular Singular, translatable name of the post type item. If no value is … … 544 546 * @since BuddyPress (2.2.0) 545 547 * 546 * @return object actions ordered by their position548 * @return object Actions ordered by their position. 547 549 */ 548 550 function bp_activity_get_actions() { … … 1233 1235 1234 1236 /** 1235 * Register the activity stream actions for updates 1237 * Register the activity stream actions for updates. 1236 1238 * 1237 1239 * @since BuddyPress (1.6.0) … … 1545 1547 * @since BuddyPress (1.2.0) 1546 1548 * 1547 * @see BP_Activity_Activity::get() For more information on accepted arguments 1549 * @see BP_Activity_Activity::get() For more information on accepted arguments. 1548 1550 * @uses wp_parse_args() 1549 * @uses apply_filters() To call the 'bp_activity_get_specific' hook 1551 * @uses apply_filters() To call the 'bp_activity_get_specific' hook. 1550 1552 * @uses BP_Activity_Activity::get() {@link BP_Activity_Activity} 1551 1553 * … … 1605 1607 * @uses BP_Activity_Activity::rebuild_activity_comment_tree() {@link BP_Activity_Activity} 1606 1608 * @uses wp_cache_delete() 1607 * @uses do_action() To call the 'bp_activity_add' hook 1609 * @uses do_action() To call the 'bp_activity_add' hook. 1608 1610 * 1609 1611 * @param array|string $args { … … 1728 1730 * @type int $user_id Optional. Defaults to the logged-in user. 1729 1731 * } 1730 * @return int $activity_id The activity id 1732 * @return int $activity_id The activity id. 1731 1733 */ 1732 1734 function bp_activity_post_update( $args = '' ) { … … 2447 2449 * @param int $comment_id The ID of the comment to be deleted. 2448 2450 * 2449 * @return bool True on success, false on failure 2451 * @return bool True on success, false on failure. 2450 2452 */ 2451 2453 function bp_activity_delete_comment( $activity_id, $comment_id ) { … … 2618 2620 * 2619 2621 * @uses esc_attr() 2620 * @uses apply_filters() To call the 'bp_activity_thumbnail_content_images' hook 2622 * @uses apply_filters() To call the 'bp_activity_thumbnail_content_images' hook. 2621 2623 * 2622 2624 * @param string $content The content of the activity item. … … 2627 2629 * 2628 2630 * @return string $content The content with images stripped and replaced with a 2629 * single thumb.2631 * single thumb. 2630 2632 */ 2631 2633 function bp_activity_thumbnail_content_images( $content, $link = false, $args = false ) { … … 2979 2981 * @see bp_embed_activity_cache() 2980 2982 * @see bp_embed_activity_save_cache() 2983 * 2981 2984 * @uses add_filter() To attach 'bp_get_activity_id' to 'embed_post_id'. 2982 2985 * @uses add_filter() To attach 'bp_embed_activity_cache' to 'bp_embed_get_cache'. … … 3003 3006 * @see bp_embed_activity_cache() 3004 3007 * @see bp_embed_activity_save_cache() 3008 * 3005 3009 * @uses add_filter() To attach 'bp_get_activity_comment_id' to 'embed_post_id'. 3006 3010 * @uses add_filter() To attach 'bp_embed_activity_cache' to 'bp_embed_get_cache'. -
trunk/src/bp-activity/bp-activity-loader.php
r9833 r9834 131 131 * @uses bp_get_groups_slug() 132 132 * 133 * @param array $main_nav Optional. See BP_Component::setup_nav() for 134 * description. 135 * @param array $sub_nav Optional. See BP_Component::setup_nav() for 136 * description. 133 * @param array $main_nav Optional. See BP_Component::setup_nav() for description. 134 * @param array $sub_nav Optional. See BP_Component::setup_nav() for description. 137 135 */ 138 136 public function setup_nav( $main_nav = array(), $sub_nav = array() ) { … … 370 368 371 369 /** 372 * Setup cache groups 370 * Setup cache groups. 373 371 * 374 372 * @since BuddyPress (2.2.0) -
trunk/src/bp-activity/bp-activity-notifications.php
r9833 r9834 35 35 * @uses apply_filters() To call the 'bp_activity_at_message_notification_message' hook. 36 36 * @uses wp_mail() 37 * @uses do_action() To call the 'bp_activity_sent_mention_email' hook 37 * @uses do_action() To call the 'bp_activity_sent_mention_email' hook. 38 38 * 39 39 * @param int $activity_id The ID of the activity update. … … 164 164 * @uses get_blog_option() 165 165 * @uses bp_get_root_blog_id() 166 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_to' hook 167 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_subject' hook 168 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_message' hook 166 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_to' hook. 167 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_subject' hook. 168 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_message' hook. 169 169 * @uses wp_mail() 170 * @uses do_action() To call the 'bp_activity_sent_reply_to_update_email' hook 171 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_to' hook 172 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_subject' hook 173 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_message' hook 174 * @uses do_action() To call the 'bp_activity_sent_reply_to_reply_email' hook 170 * @uses do_action() To call the 'bp_activity_sent_reply_to_update_email' hook. 171 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_to' hook. 172 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_subject' hook. 173 * @uses apply_filters() To call the 'bp_activity_new_comment_notification_comment_author_message' hook. 174 * @uses do_action() To call the 'bp_activity_sent_reply_to_reply_email' hook. 175 175 * 176 176 * @param int $comment_id The comment id. … … 357 357 358 358 /** 359 * Helper method to map action arguments to function parameters 359 * Helper method to map action arguments to function parameters. 360 360 * 361 361 * @since BuddyPress (1.9.0) -
trunk/src/bp-activity/bp-activity-screens.php
r9833 r9834 122 122 * @uses bp_update_is_item_admin() 123 123 * @uses bp_current_user_can() 124 * @uses do_action() To call the 'bp_activity_screen_groups' hook 125 * @uses bp_core_load_template() 126 * @uses apply_filters() To call the 'bp_activity_template_groups_activity' hook 124 * @uses do_action() To call the 'bp_activity_screen_groups' hook. 125 * @uses bp_core_load_template() 126 * @uses apply_filters() To call the 'bp_activity_template_groups_activity' hook. 127 127 */ 128 128 function bp_activity_screen_groups() { … … 156 156 * @uses bp_update_is_item_admin() 157 157 * @uses bp_current_user_can() 158 * @uses do_action() To call the 'bp_activity_screen_favorites' hook 159 * @uses bp_core_load_template() 160 * @uses apply_filters() To call the 'bp_activity_template_favorite_activity' hook 158 * @uses do_action() To call the 'bp_activity_screen_favorites' hook. 159 * @uses bp_core_load_template() 160 * @uses apply_filters() To call the 'bp_activity_template_favorite_activity' hook. 161 161 */ 162 162 function bp_activity_screen_favorites() { … … 187 187 * @uses bp_update_is_item_admin() 188 188 * @uses bp_current_user_can() 189 * @uses do_action() To call the 'bp_activity_screen_mentions' hook 190 * @uses bp_core_load_template() 191 * @uses apply_filters() To call the 'bp_activity_template_mention_activity' hook 189 * @uses do_action() To call the 'bp_activity_screen_mentions' hook. 190 * @uses bp_core_load_template() 191 * @uses apply_filters() To call the 'bp_activity_template_mention_activity' hook. 192 192 */ 193 193 function bp_activity_screen_mentions() { … … 239 239 * @uses groups_get_group() 240 240 * @uses groups_is_user_member() 241 * @uses apply_filters_ref_array() To call the 'bp_activity_permalink_access' hook 242 * @uses do_action() To call the 'bp_activity_screen_single_activity_permalink' hook 241 * @uses apply_filters_ref_array() To call the 'bp_activity_permalink_access' hook. 242 * @uses do_action() To call the 'bp_activity_screen_single_activity_permalink' hook. 243 243 * @uses bp_core_add_message() 244 244 * @uses is_user_logged_in() … … 249 249 * @uses bp_get_activity_root_slug() 250 250 * @uses bp_core_load_template() 251 * @uses apply_filters() To call the 'bp_activity_template_profile_activity_permalink' hook 251 * @uses apply_filters() To call the 'bp_activity_template_profile_activity_permalink' hook. 252 252 */ 253 253 function bp_activity_screen_single_activity_permalink() { -
trunk/src/bp-activity/bp-activity-template.php
r9833 r9834 84 84 } 85 85 /** 86 * Return activity directory permalink 86 * Return activity directory permalink. 87 87 * 88 88 * @since BuddyPress (1.5.0) … … 556 556 * @type string $scope Use a BuddyPress pre-built filter. 557 557 * - 'just-me' retrieves items belonging only to a user; this is equivalent 558 * to passing a 'user_id' argument 559 * - 'friends' retrieves items belonging to the friends of a user 560 * - 'groups' retrieves items belonging to groups to which a user belongs to 561 * - 'favorites' retrieves a user's favorited activity items 562 * - 'mentions' retrieves items where a user has received an @-mention 558 * to passing a 'user_id' argument. 559 * - 'friends' retrieves items belonging to the friends of a user. 560 * - 'groups' retrieves items belonging to groups to which a user belongs to. 561 * - 'favorites' retrieves a user's favorited activity items. 562 * - 'mentions' retrieves items where a user has received an @-mention. 563 563 * The default value of 'scope' is set to one of the above if that value 564 564 * appears in the appropriate place in the URL; eg, 'scope' will be 'groups' … … 592 592 * @type string|bool $display_comments How to handle activity comments. Possible values: 593 593 * - 'threaded' - comments appear in a threaded tree, under their parent 594 * items 594 * items. 595 595 * - 'stream' - the activity stream is presented in a flat manner, with 596 * comments sorted in chronological order alongside other activity items 597 * - false - don't fetch activity comments at all 596 * comments sorted in chronological order alongside other activity items. 597 * - false - don't fetch activity comments at all. 598 598 * Default: 'threaded'. 599 599 * @type bool $show_hidden Whether to show items marked hide_sitewide. Defaults to false, except in 600 600 * the following cases: 601 * - User is viewing his own activity stream 601 * - User is viewing his own activity stream. 602 602 * - User is viewing the activity stream of a non-public group of which he 603 * is a member 603 * is a member. 604 604 * @type string|bool $spam Spam status. 'ham_only', 'spam_only', or false to show all activity 605 605 * regardless of spam status. Default: 'ham_only'. … … 796 796 } 797 797 /** 798 * Get the URL for the Load More link 798 * Get the URL for the Load More link. 799 799 * 800 800 * @since BuddyPress (2.1.0) … … 811 811 * @since BuddyPress (2.1.0) 812 812 * 813 * @param string $link The "Load More" link URL with appropriate query args 814 * @param string $url The original URL 815 * @param object $activities_template The activity template loop global 813 * @param string $link The "Load More" link URL with appropriate query args. 814 * @param string $url The original URL. 815 * @param object $activities_template The activity template loop global. 816 816 */ 817 817 return apply_filters( 'bp_get_activity_load_more_link', $link, $url, $activities_template ); … … 1048 1048 * 1049 1049 * @global string $bp_activity_no_activity 1050 * @uses apply_filters() To call the 'bp_get_activities_no_activity' hook 1050 * @uses apply_filters() To call the 'bp_get_activities_no_activity' hook. 1051 1051 * @todo Deprecate. 1052 1052 * … … 1203 1203 1204 1204 /** 1205 * Output the display name of the member who posted the activity 1205 * Output the display name of the member who posted the activity. 1206 1206 * 1207 1207 * @since BuddyPress (2.1.0) … … 1214 1214 1215 1215 /** 1216 * Return the display name of the member who posted the activity 1216 * Return the display name of the member who posted the activity. 1217 1217 * 1218 1218 * @since BuddyPress (2.1.0) … … 1436 1436 * @uses bp_is_single_activity() 1437 1437 * @uses wp_parse_args() 1438 * @uses apply_filters() To call the 'bp_get_activity_avatar_object_' . $current_activity_item->component hook 1439 * @uses apply_filters() To call the 'bp_get_activity_avatar_item_id' hook 1438 * @uses apply_filters() To call the 'bp_get_activity_avatar_object_' . $current_activity_item->component hook. 1439 * @uses apply_filters() To call the 'bp_get_activity_avatar_item_id' hook. 1440 1440 * @uses bp_core_fetch_avatar() 1441 * @uses apply_filters() To call the 'bp_get_activity_avatar' hook 1441 * @uses apply_filters() To call the 'bp_get_activity_avatar' hook. 1442 1442 * 1443 1443 * @param array|string $args { … … 1564 1564 1565 1565 /** 1566 * Return the avatar of the object that action was performed on 1566 * Return the avatar of the object that action was performed on. 1567 1567 * 1568 1568 * @since BuddyPress (1.2.0) … … 1577 1577 * @uses apply_filters() To call the 'bp_get_activity_secondary_avatar' hook. 1578 1578 * 1579 * @param array $args {1579 * @param array|string $args { 1580 1580 * For a complete description of arguments, see {@link bp_core_fetch_avatar()}. 1581 1581 * @type string $alt Default value varies based on current activity … … 1741 1741 1742 1742 /** 1743 * Output the activity action 1743 * Output the activity action. 1744 1744 * 1745 1745 * @since BuddyPress (1.2.0) … … 1753 1753 1754 1754 /** 1755 * Return the activity action 1755 * Return the activity action. 1756 1756 * 1757 1757 * @since BuddyPress (1.2.0) … … 1759 1759 * @global object $activities_template {@link BP_Activity_Template} 1760 1760 * @param array $args Only parameter is "no_timestamp". If true, timestamp is shown in output. 1761 * @uses apply_filters_ref_array() To call the 'bp_get_activity_action_pre_meta' hook 1761 * @uses apply_filters_ref_array() To call the 'bp_get_activity_action_pre_meta' hook. 1762 1762 * @uses bp_insert_activity_meta() 1763 1763 * @uses apply_filters_ref_array() To call the 'bp_get_activity_action' hook. … … 1809 1809 1810 1810 /** 1811 * Output the activity content body 1811 * Output the activity content body. 1812 1812 * 1813 1813 * @since BuddyPress (1.2.0) … … 1820 1820 1821 1821 /** 1822 * Return the activity content body 1822 * Return the activity content body. 1823 1823 * 1824 1824 * @since BuddyPress (1.2.0) … … 1899 1899 /** 1900 1900 * If you want to filter activity update content, please use 1901 * the filter 'bp_get_activity_content_body' 1901 * the filter 'bp_get_activity_content_body'. 1902 1902 * 1903 1903 * This function is mainly for backwards compatibility. … … 1992 1992 * 1993 1993 * @global object $activities_template {@link BP_Activity_Template} 1994 * @uses apply_filters() To call the 'bp_activity_user_can_delete' hook 1994 * @uses apply_filters() To call the 'bp_activity_user_can_delete' hook. 1995 1995 * 1996 1996 * @param object|bool $activity Optional. Falls back on the current item in the loop. … … 2070 2070 * @param string $args Unused. Left over from an earlier implementation. 2071 2071 * 2072 * @return mixed False on failure, otherwise the activity parent content 2072 * @return mixed False on failure, otherwise the activity parent content. 2073 2073 */ 2074 2074 function bp_get_activity_parent_content( $args = '' ) { … … 2244 2244 2245 2245 /** 2246 * Loops through a level of activity comments and loads the template for each 2246 * Loops through a level of activity comments and loads the template for each. 2247 2247 * 2248 2248 * Note: The recursion itself used to happen entirely in this function. Now it is … … 2251 2251 * @since BuddyPress (1.2.0) 2252 2252 * 2253 * @param object $comment The activity object currently being recursed 2253 * @param object $comment The activity object currently being recursed. 2254 2254 * 2255 2255 * @global object $activities_template {@link BP_Activity_Template} … … 2428 2428 * @uses bp_core_get_user_domain() 2429 2429 * @uses bp_get_activity_comment_user_id() 2430 * @uses apply_filters() To call the 'bp_activity_comment_user_link' hook 2430 * @uses apply_filters() To call the 'bp_activity_comment_user_link' hook. 2431 2431 * 2432 2432 * @return string $user_link The URL of the activity comment author's profile. … … 2507 2507 * 2508 2508 * @uses bp_core_time_since() 2509 * @uses apply_filters() To call the 'bp_activity_comment_date_recorded' hook 2509 * @uses apply_filters() To call the 'bp_activity_comment_date_recorded' hook. 2510 2510 * 2511 2511 * @return string|bool $date_recorded Time since the activity was recorded, … … 2542 2542 * @global object $activities_template {@link BP_Activity_Template} 2543 2543 * @uses bp_core_time_since() 2544 * @uses apply_filters() To call the 'bp_activity_comment_date_recorded' hook 2544 * @uses apply_filters() To call the 'bp_activity_comment_date_recorded' hook. 2545 2545 * 2546 2546 * @return string|bool $date_recorded Time since the activity was recorded, 2547 * in the form "%s ago". False on failure.2547 * in the form "%s ago". False on failure. 2548 2548 */ 2549 2549 function bp_get_activity_comment_date_recorded_raw() { … … 2572 2572 2573 2573 /** 2574 * Gets the 'delete' URL for the activity comment currently being displayed 2574 * Gets the 'delete' URL for the activity comment currently being displayed. 2575 2575 * 2576 2576 * @since BuddyPress (1.5.0) … … 2697 2697 * 2698 2698 * @uses bp_activity_recurse_comment_count() 2699 * @uses apply_filters() To call the 'bp_activity_recurse_comment_count' hook 2699 * @uses apply_filters() To call the 'bp_activity_recurse_comment_count' hook. 2700 2700 * 2701 2701 * @param object $comment Activity comment object. … … 2742 2742 * @since BuddyPress (2.0.0) 2743 2743 * 2744 * @return int $depth Depth for the current activity comment 2744 * @return int $depth Depth for the current activity comment. 2745 2745 */ 2746 2746 function bp_activity_get_comment_depth() { … … 2991 2991 * @uses home_url() 2992 2992 * @uses bp_get_activity_root_slug() 2993 * @uses apply_filters() To call the 'bp_get_activity_favorite_link' hook 2993 * @uses apply_filters() To call the 'bp_get_activity_favorite_link' hook. 2994 2994 * 2995 2995 * @return string The activity favorite link. … … 3159 3159 3160 3160 /** 3161 * Output the URL to delete a single activity stream item 3161 * Output the URL to delete a single activity stream item. 3162 3162 * 3163 3163 * @since BuddyPress (2.1.0) … … 3169 3169 } 3170 3170 /** 3171 * Return the URL to delete a single activity item 3171 * Return the URL to delete a single activity item. 3172 3172 * 3173 3173 * @since BuddyPress (2.1.0) … … 3230 3230 * @uses bp_core_is_user_deleted() 3231 3231 * @uses bp_get_user_meta() 3232 * @uses apply_filters() To call the 'bp_get_activity_latest_update_excerpt' hook 3232 * @uses apply_filters() To call the 'bp_get_activity_latest_update_excerpt' hook. 3233 3233 * @uses bp_create_excerpt() 3234 3234 * @uses bp_get_root_domain() 3235 3235 * @uses bp_get_activity_root_slug() 3236 * @uses apply_filters() To call the 'bp_get_activity_latest_update' hook 3236 * @uses apply_filters() To call the 'bp_get_activity_latest_update' hook. 3237 3237 * 3238 3238 * @param int $user_id If empty, will fall back on displayed user. 3239 3239 * 3240 3240 * @return string|bool $latest_update The activity latest update link. 3241 * False on failure 3241 * False on failure. 3242 3242 */ 3243 3243 function bp_get_activity_latest_update( $user_id = 0 ) { … … 3545 3545 * 3546 3546 * @uses bp_activity_total_favorites_for_user() 3547 * @uses apply_filters() To call the 'bp_get_total_favorite_count_for_user' hook 3547 * @uses apply_filters() To call the 'bp_get_total_favorite_count_for_user' hook. 3548 3548 * 3549 3549 * @param int $user_id ID of user being queried. Default: displayed user ID. … … 3646 3646 * @uses wp_nonce_url() 3647 3647 * @uses bp_get_activity_directory_permalink() 3648 * @uses apply_filters() To call the 'bp_get_send_public_message_link' hook 3648 * @uses apply_filters() To call the 'bp_get_send_public_message_link' hook. 3649 3649 * 3650 3650 * @return string The public message link for the displayed user. … … 3714 3714 3715 3715 /** 3716 * Returns the mentioned user display name 3716 * Returns the mentioned user display name. 3717 3717 * 3718 3718 * @since BuddyPress (1.2.0) … … 4294 4294 4295 4295 /** 4296 * Output the activity feed item link 4296 * Output the activity feed item link. 4297 4297 * 4298 4298 * @since BuddyPress (1.0.0) … … 4305 4305 4306 4306 /** 4307 * Return the activity feed item link 4307 * Return the activity feed item link. 4308 4308 * 4309 4309 * @since BuddyPress (1.0.0) … … 4450 4450 * 4451 4451 * @param string $context The current context. 'activity', 'member', 4452 * 'member_groups', 'group' 4452 * 'member_groups', 'group'. 4453 4453 * 4454 4454 * @return string HTML for <option> values. -
trunk/src/bp-activity/classes/class-bp-activity-activity.php
r9833 r9834 72 72 73 73 /** 74 * Description of the activity, eg 'Alex updated his profile.' 74 * Description of the activity, eg 'Alex updated his profile.'. 75 75 * 76 76 * @var string … … 259 259 260 260 /** 261 * Get activity items, as specified by parameters 261 * Get activity items, as specified by parameters. 262 262 * 263 263 * @see BP_Activity_Activity::get_filter_sql() for a description of the … … 859 859 * @since BuddyPress (2.2.0) 860 860 * 861 * @param mixed $scope The activity scope. Accepts string or array of scopes 861 * @param mixed $scope The activity scope. Accepts string or array of scopes. 862 862 * @param array $r Current activity arguments. Same as those of BP_Activity_Activity::get(), 863 863 * but merged with defaults. 864 864 * 865 * @return array 'sql' WHERE SQL string and 'override' activity args 865 * @return array 'sql' WHERE SQL string and 'override' activity args. 866 866 */ 867 867 public static function get_scope_query_sql( $scope = false, $r = array() ) { … … 917 917 * @type array $override Optional. Override existing activity arguments passed by $r. 918 918 * } 919 * @param array $r Current activity arguments passed in BP_Activity_Activity::get() 919 * @param array $r Current activity arguments passed in BP_Activity_Activity::get(). 920 920 */ 921 921 $scope_args = apply_filters( "bp_activity_set_{$scope}_scope_args", array(), $r ); … … 964 964 * @deprecated Use BP_Activity_Activity::get() with an 'in' parameter instead. 965 965 * 966 * @param mixed $activity_ids Array or comma-separated string of activity IDs to retrieve 967 * @param int|bool $max Maximum number of results to return. (Optional; default is no maximum) 968 * @param int $page The set of results that the user is viewing. Used in pagination. (Optional; default is 1) 969 * @param int $per_page Specifies how many results per page. Used in pagination. (Optional; default is 25) 970 * @param string $sort MySQL column sort; ASC or DESC. (Optional; default is DESC) 971 * @param bool $display_comments Retrieve an activity item's associated comments or not. (Optional; default is false) 966 * @param mixed $activity_ids Array or comma-separated string of activity IDs to retrieve. 967 * @param int|bool $max Maximum number of results to return. (Optional; default is no maximum). 968 * @param int $page The set of results that the user is viewing. Used in pagination. (Optional; default is 1). 969 * @param int $per_page Specifies how many results per page. Used in pagination. (Optional; default is 25). 970 * @param string $sort MySQL column sort; ASC or DESC. (Optional; default is DESC). 971 * @param bool $display_comments Retrieve an activity item's associated comments or not. (Optional; default is false). 972 * 972 973 * @return array 973 974 */ … … 980 981 * Get the first activity ID that matches a set of criteria. 981 982 * 982 * @param int $user_id User ID to filter by 983 * @param string $component Component to filter by 984 * @param string $type Activity type to filter by 985 * @param int $item_id Associated item to filter by 986 * @param int $secondary_item_id Secondary associated item to filter by 987 * @param string $action Action to filter by 988 * @param string $content Content to filter by 989 * @param string $date_recorded Date to filter by 983 * @param int $user_id User ID to filter by. 984 * @param string $component Component to filter by. 985 * @param string $type Activity type to filter by. 986 * @param int $item_id Associated item to filter by. 987 * @param int $secondary_item_id Secondary associated item to filter by. 988 * @param string $action Action to filter by. 989 * @param string $content Content to filter by. 990 * @param string $date_recorded Date to filter by. 990 991 * 991 992 * @todo Should parameters be optional? … … 1152 1153 1153 1154 /** 1154 * Action to allow intercepting activity items to be deleted 1155 * Action to allow intercepting activity items to be deleted. 1155 1156 * 1156 1157 * @since BuddyPress (2.3.0) 1157 1158 * 1158 * @param array $activities Array of activities 1159 * @param array $r Array of parsed arguments 1159 * @param array $activities Array of activities. 1160 * @param array $r Array of parsed arguments. 1160 1161 */ 1161 1162 do_action_ref_array( 'bp_activity_before_delete', array( $activities, $r ) ); … … 1170 1171 1171 1172 /** 1172 * Action to allow intercepting activity items just deleted 1173 * Action to allow intercepting activity items just deleted. 1173 1174 * 1174 1175 * @since BuddyPress (2.3.0) 1175 1176 * 1176 * @param array $activities Array of activities 1177 * @param array $r Array of parsed arguments 1177 * @param array $activities Array of activities. 1178 * @param array $r Array of parsed arguments. 1178 1179 */ 1179 1180 do_action_ref_array( 'bp_activity_after_delete', array( $activities, $r ) ); … … 1273 1274 * @since BuddyPress (1.2.0) 1274 1275 * 1275 * @global wpdb $wpdb WordPress database object 1276 * @global wpdb $wpdb WordPress database object. 1276 1277 * 1277 1278 * @param array $activities Activities to fetch comments for. … … 1459 1460 * @since BuddyPress (1.2.0) 1460 1461 * 1461 * @global wpdb $wpdb WordPress database object 1462 * 1463 * @param int $parent_id ID of an activity or activity comment 1464 * @param int $left Node boundary start for activity or activity comment 1465 * @return int Right Node boundary of activity or activity comment 1462 * @global wpdb $wpdb WordPress database object. 1463 * 1464 * @param int $parent_id ID of an activity or activity comment. 1465 * @param int $left Node boundary start for activity or activity comment. 1466 * @return int Right Node boundary of activity or activity comment. 1466 1467 */ 1467 1468 public static function rebuild_activity_comment_tree( $parent_id, $left = 1 ) { … … 1760 1761 * @see http://php.net/manual/en/function.array-replace-recursive.php#109390 1761 1762 * 1762 * @param array $base Array with keys needing to be replaced 1763 * @param array $replacements Array with the replaced keys 1763 * @param array $base Array with keys needing to be replaced. 1764 * @param array $replacements Array with the replaced keys. 1764 1765 * 1765 1766 * @return array -
trunk/src/bp-activity/classes/class-bp-activity-feed.php
r9833 r9834 41 41 * updated using PHP 5.2+ methods. 42 42 * 43 * @see BP_Feed::__construct() This is where $data is added 43 * @see BP_Feed::__construct() This is where $data is added. 44 44 * @var array 45 45 */ … … 67 67 * Constructor. 68 68 * 69 * @param array $args Optional 69 * @param array $args Optional. 70 70 */ 71 71 public function __construct( $args = array() ) { -
trunk/src/bp-activity/classes/class-bp-activity-query.php
r9833 r9834 67 67 * @type string $compare Optional. The comparison operator. Default '='. 68 68 * Accepts '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'LIKE', 69 * 'NOT LIKE', BETWEEN', 'NOT BETWEEN', 'REGEXP', 'NOT REGEXP', 'RLIKE' 69 * 'NOT LIKE', BETWEEN', 'NOT BETWEEN', 'REGEXP', 'NOT REGEXP', 'RLIKE'. 70 70 * @type string $relation Optional. The boolean relationship between the activity queries. 71 71 * Accepts 'OR', 'AND'. Default 'AND'.
Note:
See TracChangeset
for help on using the changeset viewer.
