Index: src/bp-activity/js/mentions.js =================================================================== --- src/bp-activity/js/mentions.js (revision 12535) +++ src/bp-activity/js/mentions.js (working copy) @@ -87,7 +87,7 @@ * @since 2.1.0 */ before_reposition: function( offset ) { - // get the iframe, if any, already applied with atwho. + // get the iframe, if any, already applied with at who. var caret, line, iframeOffset, @@ -126,7 +126,7 @@ // New position is under the caret (never above) and positioned to follow. // Dynamic sizing based on the input area (remove 'px' from end). line = parseInt( this.$inputor.css( 'line-height' ).substr( 0, this.$inputor.css( 'line-height' ).length - 2 ), 10 ); - if ( !line || line < 5 ) { // sanity check, and catch no line-height. + if ( !line || line < 5 ) { // Sanity check, and catch no line-height. line = 19; } Index: src/bp-blogs/bp-blogs-activity.php =================================================================== --- src/bp-blogs/bp-blogs-activity.php (revision 12535) +++ src/bp-blogs/bp-blogs-activity.php (working copy) @@ -287,7 +287,7 @@ $blog_url = false; - // Try to get the blog url from the activity object + // Try to get the blog url from the activity object. if ( isset( $activity->blog_url ) ) { $blog_url = $activity->blog_url; } else { @@ -296,7 +296,7 @@ $blog_name = false; - // Try to get the blog name from the activity object + // Try to get the blog name from the activity object. if ( isset( $activity->blog_name ) ) { $blog_name = $activity->blog_name; } else { @@ -313,7 +313,7 @@ $post_url = false; - // Try to get the post url from the activity object + // Try to get the post url from the activity object. if ( isset( $activity->post_url ) ) { $post_url = $activity->post_url; @@ -328,11 +328,11 @@ $post_title = false; - // Should be the case when the comment has just been published + // Should be the case when the comment has just been published. if ( isset( $activity->post_title ) ) { $post_title = $activity->post_title; - // If activity already exists try to get the post title from activity meta + // If activity already exists try to get the post title from activity meta. } elseif ( ! empty( $activity->id ) ) { $post_title = bp_activity_get_meta( $activity->id, 'post_title' ); } @@ -789,7 +789,7 @@ $user = bp_core_get_core_userdata( $params['user_id'] ); } - // Get associated post type and set default comment parent + // Get associated post type and set default comment parent. $post_type = bp_activity_post_type_get_tracking_arg( $parent_activity->type, 'post_type' ); $comment_parent = 0; @@ -805,7 +805,7 @@ 'comment_author_email' => $user->user_email, 'comment_author_url' => bp_core_get_user_domain( $params['user_id'], $user->user_nicename, $user->user_login ), 'comment_content' => $params['content'], - 'comment_type' => '', // Could be interesting to add 'buddypress' here... + 'comment_type' => '', // Could be interesting to add 'buddyPress' here... 'comment_parent' => (int) $comment_parent, 'user_id' => $params['user_id'], 'comment_approved' => 1 @@ -909,7 +909,7 @@ $activity_ids = bp_activity_recurse_comments_activity_ids( $activity ); $activity_ids[] = $activity_id; - // Handle multisite + // Handle multisite. // switch to the blog where the comment was made. switch_to_blog( $parent_activity->item_id ); @@ -923,7 +923,7 @@ // emulate bp_activity_delete_comment(). BP_Activity_Activity::rebuild_activity_comment_tree( $parent_activity_id ); - // Avoid the error message although the comments were successfully deleted + // Avoid the error message although the comments were successfully deleted. $deleted = true; // We're overriding the default bp_activity_delete_comment() functionality @@ -946,10 +946,10 @@ return; } - // fetch parent activity item + // Fetch parent activity item. $parent_activity = new BP_Activity_Activity( $activity->item_id ); - // if parent activity isn't a post type having the buddypress-activity support for comments, stop now! + // If parent activity isn't a post type having the buddypress-activity support for comments, stop now! if ( ! bp_activity_type_supports( $parent_activity->type, 'post-type-comment-tracking' ) ) { return; } @@ -971,11 +971,11 @@ // Handle multisite. switch_to_blog( $parent_activity->item_id ); - // Get the comment status + // Get the comment status. $post_comment_status = wp_get_comment_status( $post_comment_id ); $old_comment_status = $post_comment_status; - // No need to edit the activity, as it's the activity who's updating the comment + // No need to edit the activity, as it's the activity who's updating the comment. remove_action( 'transition_comment_status', 'bp_activity_transition_post_type_comment_status', 10 ); remove_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment', 10 ); @@ -995,7 +995,7 @@ } } - // Restore actions + // Restore actions. add_action( 'transition_comment_status', 'bp_activity_transition_post_type_comment_status', 10, 3 ); add_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment', 10, 4 ); @@ -1054,15 +1054,15 @@ return $args; } - // Get the associated post type + // Get the associated post type. $post_type = bp_activity_post_type_get_tracking_arg( $args['action'], 'post_type' ); - // Bail if this is not an activity associated with a post type + // Bail if this is not an activity associated with a post type. if ( empty( $post_type ) ) { return $args; } - // Bail if this is an activity about posts and not comments + // Bail if this is an activity about posts and not comments. if ( bp_activity_post_type_get_tracking_arg( $args['action'], 'comment_action_id' ) ) { return $args; } @@ -1235,7 +1235,7 @@ // It's a post type supporting comment tracking. if ( bp_activity_type_supports( $type, 'post-type-comment-tracking' ) ) { - // The activity type is supporting comments or replies + // The activity type is supporting comments or replies. if ( bp_activity_type_supports( $type, 'post-type-comment-reply' ) ) { // Setup some globals we'll need to reference later. bp_blogs_setup_activity_loop_globals( $activities_template->activity ); @@ -1250,7 +1250,7 @@ if ( isset( buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) && buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) { $retval = false; } - // The activity type does not support comments or replies + // The activity type does not support comments or replies. } else { $retval = false; } @@ -1285,7 +1285,7 @@ return $retval; } - // Check the parent activity + // Check the parent activity. $parent_activity = new BP_Activity_Activity( bp_get_activity_item_id() ); if ( isset( $parent_activity->type ) && bp_activity_post_type_get_tracking_arg( $parent_activity->type, 'post_type' ) ) { @@ -1438,15 +1438,15 @@ if ( ! empty( $blog_comment_id ) ) { $bp = buddypress(); - // Check if a comment action id is set for the parent activity + // Check if a comment action id is set for the parent activity. $comment_action_id = bp_activity_post_type_get_tracking_arg( $parent_activity->type, 'comment_action_id' ); - // Use the action string callback for the activity type + // Use the action string callback for the activity type. if ( ! empty( $comment_action_id ) ) { // Fake a 'new_{post_type}_comment' by cloning the activity object. $object = clone $activity; - // Set the type of the activity to be a comment about a post type + // Set the type of the activity to be a comment about a post type. $object->type = $comment_action_id; // Use the blog ID as the item_id. @@ -1455,10 +1455,10 @@ // Use comment ID as the secondary_item_id. $object->secondary_item_id = $blog_comment_id; - // Get the format callback for this activity comment + // Get the format callback for this activity comment. $format_callback = bp_activity_post_type_get_tracking_arg( $comment_action_id, 'format_callback' ); - // now format the activity action using the 'new_{post_type}_comment' action callback + // Now format the activity action using the 'new_{post_type}_comment' action callback. if ( is_callable( $format_callback ) ) { $retval = call_user_func_array( $format_callback, array( '', $object ) ); } Index: src/bp-blogs/bp-blogs-functions.php =================================================================== --- src/bp-blogs/bp-blogs-functions.php (revision 12535) +++ src/bp-blogs/bp-blogs-functions.php (working copy) @@ -45,13 +45,13 @@ // Parse query arguments. $r = bp_parse_args( $args, array( - 'type' => 'active', // 'active', 'alphabetical', 'newest', or 'random' - 'include_blog_ids' => false, // Array of blog IDs to include - 'user_id' => false, // Limit to blogs this user can post to - 'search_terms' => false, // Limit to blogs matching these search terms - 'per_page' => 20, // The number of results to return per page - 'page' => 1, // The page to return if limiting per page - 'update_meta_cache' => true // Whether to pre-fetch blogmeta + 'type' => 'active', // 'active', 'alphabetical', 'newest', or 'random'. + 'include_blog_ids' => false, // Array of blog IDs to include. + 'user_id' => false, // Limit to blogs this user can post to. + 'search_terms' => false, // Limit to blogs matching these search terms. + 'per_page' => 20, // The number of results to return per page. + 'page' => 1, // The page to return if limiting per page. + 'update_meta_cache' => true // Whether to pre-fetch blogmeta. ), 'blogs_get_blogs' ); // Get the blogs. @@ -106,17 +106,17 @@ 'site_id' => $wpdb->siteid ), 'record_existing_blogs' ); - // Truncate all BP blogs tables if starting fresh + // Truncate all BP blogs tables if starting fresh. if ( empty( $r['offset'] ) && empty( $r['blog_ids'] ) ) { $bp = buddypress(); - // Truncate user blogs table + // Truncate user blogs table. $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name}" ); if ( is_wp_error( $truncate ) ) { return false; } - // Truncate user blogmeta table + // Truncate user blogmeta table. $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name_blogmeta}" ); if ( is_wp_error( $truncate ) ) { return false; @@ -123,17 +123,17 @@ } } - // Multisite + // Multisite. if ( is_multisite() ) { $sql = array(); $sql['select'] = $wpdb->prepare( "SELECT blog_id, last_updated FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0 AND site_id = %d", $r['site_id'] ); - // Omit root blog if large network + // Omit root blog if large network. if ( bp_is_large_install() ) { $sql['omit_root_blog'] = $wpdb->prepare( "AND blog_id != %d", bp_get_root_blog_id() ); } - // Filter by selected blog IDs + // Filter by selected blog IDs. if ( ! empty( $r['blog_ids'] ) ) { $in = implode( ',', wp_parse_id_list( $r['blog_ids'] ) ); $sql['in'] = "AND blog_id IN ({$in})"; @@ -161,9 +161,9 @@ } } - // Bail if there are no blogs + // Bail if there are no blogs. if ( empty( $blogs ) ) { - // Make sure we remove our offset marker + // Make sure we remove our offset marker. if ( is_multisite() ) { bp_delete_option( '_bp_record_blogs_offset' ); } @@ -192,24 +192,24 @@ foreach ( (array) $users as $user_id ) { bp_blogs_add_user_to_blog( $user_id, false, $blog->blog_id ); - // Clear cache + // Clear cache. bp_blogs_clear_blog_object_cache( $blog->blog_id, $user_id ); } - // Update blog last activity timestamp + // Update blog last activity timestamp. if ( ! empty( $blog->last_updated ) && false !== strtotime( $blog->last_updated ) ) { bp_blogs_update_blogmeta( $blog->blog_id, 'last_activity', $blog->last_updated ); } } - // See if we need to do this again + // See if we need to do this again. if ( is_multisite() && empty( $r['blog_ids'] ) ) { $sql['offset'] = $wpdb->prepare( " OFFSET %d", $r['limit'] + $r['offset'] ); - // Check if there are more blogs to record + // Check if there are more blogs to record. $blog_ids = $wpdb->get_results( implode( ' ', $sql ) ); - // We have more blogs; record offset and re-run function + // We have more blogs; record offset and re-run function. if ( ! empty( $blog_ids ) ) { bp_update_option( '_bp_record_blogs_offset', $r['limit'] + $r['offset'] ); bp_blogs_record_existing_blogs( array( @@ -222,7 +222,7 @@ // Bail since we have more blogs to record. return; - // No more blogs; delete offset marker + // No more blogs; delete offset marker. } else { bp_delete_option( '_bp_record_blogs_offset' ); } @@ -726,14 +726,14 @@ // Set the current blog id. $blog_id = get_current_blog_id(); - // These activity metadatas are used to build the new_blog_comment action string + // These activity metadatas are used to build the new_blog_comment action string. if ( ! empty( $activity_id ) && ! empty( $activity_args['item_id'] ) && 'new_blog_comment' === $activity_post_object->comment_action_id ) { - // add some post info in activity meta + // Add some post info in activity meta. bp_activity_update_meta( $activity_id, 'post_title', $comment->post->post_title ); bp_activity_update_meta( $activity_id, 'post_url', esc_url_raw( add_query_arg( 'p', $comment->post->ID, home_url( '/' ) ) ) ); } - // Sync comment - activity comment + // Sync comment - activity comment. if ( ! bp_disable_blogforum_comments() ) { if ( ! empty( $_REQUEST['action'] ) ) { @@ -749,7 +749,7 @@ } if ( isset( $activity_post_object->action_id ) && isset( $activity_post_object->component_id ) ) { - // find the parent 'new_post_type' activity entry + // Find the parent 'new_post_type' activity entry. $parent_activity_id = bp_activity_get_activity_id( array( 'component' => $activity_post_object->component_id, 'type' => $activity_post_object->action_id, @@ -763,13 +763,13 @@ } } - // we found the parent activity entry - // so let's go ahead and reconfigure some activity args + // We found the parent activity entry + // so let's go ahead and reconfigure some activity args. if ( ! empty( $parent_activity_id ) ) { - // set the parent activity entry ID + // Set the parent activity entry ID. $activity_args['activity_id'] = $parent_activity_id; - // now see if the WP parent comment has a BP activity ID + // Now see if the WP parent comment has a BP activity ID. $comment_parent = 0; if ( ! empty( $comment->comment_parent ) ) { $comment_parent = get_comment_meta( $comment->comment_parent, 'bp_activity_comment_id', true ); @@ -776,7 +776,7 @@ } // WP parent comment does not have a BP activity ID - // so set to 'new_' . post_type activity ID + // so set to 'new_' . post_type activity ID. if ( empty( $comment_parent ) ) { $comment_parent = $parent_activity_id; } @@ -784,24 +784,24 @@ $activity_args['parent_id'] = $comment_parent; $activity_args['skip_notification'] = true; - // could not find corresponding parent activity entry - // so wipe out $args array + // Could not find corresponding parent activity entry + // so wipe out $args array. } else { $activity_args = array(); } - // Record in activity streams + // Record in activity streams. if ( ! empty( $activity_args ) ) { $activity_id = bp_activity_new_comment( $activity_args ); if ( empty( $activity_args['id'] ) ) { - // The activity metadata to inform about the corresponding comment ID + // The activity metadata to inform about the corresponding comment ID. bp_activity_update_meta( $activity_id, "bp_blogs_{$comment->post->post_type}_comment_id", $comment->comment_ID ); - // The comment metadata to inform about the corresponding activity ID + // The comment metadata to inform about the corresponding activity ID. add_comment_meta( $comment->comment_ID, 'bp_activity_comment_id', $activity_id ); - // These activity metadatas are used to build the new_blog_comment action string + // These activity metadatas are used to build the new_blog_comment action string. if ( 'new_blog_comment' === $activity_post_object->comment_action_id ) { bp_activity_update_meta( $activity_id, 'post_title', $comment->post->post_title ); bp_activity_update_meta( $activity_id, 'post_url', esc_url_raw( add_query_arg( 'p', $comment->post->ID, home_url( '/' ) ) ) ); @@ -1054,7 +1054,7 @@ * child post comments and associated activity comments. */ if ( ! empty( $activity_id ) ) { - // fetch the activity comments for the activity item + // Fetch the activity comments for the activity item. $activity = bp_activity_get( array( 'in' => $activity_id, 'display_comments' => 'stream', @@ -1061,12 +1061,12 @@ 'spam' => 'all', ) ); - // get all activity comment IDs for the pending deleted item + // Get all activity comment IDs for the pending deleted item. if ( ! empty( $activity['activities'] ) ) { $activity_ids = bp_activity_recurse_comments_activity_ids( $activity ); $activity_ids[] = $activity_id; - // delete activity items + // Delete activity items. foreach ( $activity_ids as $activity_id ) { bp_activity_delete( array( 'id' => $activity_id @@ -1073,13 +1073,13 @@ ) ); } - // remove associated blog comments + // Remove associated blog comments. bp_blogs_remove_associated_blog_comments( $activity_ids ); - // rebuild activity comment tree + // Rebuild activity comment tree. BP_Activity_Activity::rebuild_activity_comment_tree( $activity['activities'][0]->item_id ); - // Set the result + // Set the result. $deleted = true; } } Index: src/bp-blogs/classes/class-bp-blogs-blog.php =================================================================== --- src/bp-blogs/classes/class-bp-blogs-blog.php (revision 12535) +++ src/bp-blogs/classes/class-bp-blogs-blog.php (working copy) @@ -86,7 +86,7 @@ $this->user_id = apply_filters( 'bp_blogs_blog_user_id_before_save', $this->user_id, $this->id ); /** - * Filters the blog blog ID before save. + * Filters the blog ID before save. * * @since 1.0.0 *