Index: bp-activity/bp-activity-classes.php
===================================================================
--- bp-activity/bp-activity-classes.php
+++ bp-activity/bp-activity-classes.php
@@ -445,7 +445,7 @@ Class BP_Activity_Activity {
 
 		$activities = bp_activity_get_sitewide( array( 'max' => $limit ) );
 
-		for ( $i = 0; $i < count($activities); $i++ ) {
+		for ( $i = 0, $count = count( $activities ); $i < $count; ++$i ) {
 				$title = explode( '<span', $activities[$i]['content'] );
 
 				$activity_feed[$i]['title'] = trim( strip_tags( $title[0] ) );
Index: bp-blogs/bp-blogs-classes.php
===================================================================
--- bp-blogs/bp-blogs-classes.php
+++ bp-blogs/bp-blogs-classes.php
@@ -250,7 +250,7 @@ Class BP_Blogs_Blog {
 		if ( empty( $blog_ids ) )
 			return $paged_blogs;
 
-		for ( $i = 0; $i < count( $paged_blogs ); $i++ ) {
+		for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {
 			$blog_prefix = $wpdb->get_blog_prefix( $paged_blogs[$i]->blog_id );
 			$paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT post_title, guid FROM {$blog_prefix}posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
 		}
@@ -258,7 +258,7 @@ Class BP_Blogs_Blog {
 		/* Fetch the blog description for each blog (as it may be empty we can't fetch it in the main query). */
 		$blog_descs = $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, meta_value as description FROM {$bp->blogs->table_name_blogmeta} WHERE meta_key = 'description' AND blog_id IN ( {$blog_ids} )" ) );
 
-		for ( $i = 0; $i < count( $paged_blogs ); $i++ ) {
+		for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {
 			foreach ( (array)$blog_descs as $desc ) {
 				if ( $desc->blog_id == $paged_blogs[$i]->blog_id )
 					$paged_blogs[$i]->description = $desc->description;
Index: bp-core/bp-core-classes.php
===================================================================
--- bp-core/bp-core-classes.php
+++ bp-core/bp-core-classes.php
@@ -509,7 +509,7 @@ class BP_Core_User {
 		// Fetch the user's full name
 		if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
 			$names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", bp_xprofile_fullname_field_name() ) );
-			for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+			for ( $i = 0, $count = count( $paged_users ); $i < $count; ++$i ) {
 				foreach ( (array)$names as $name ) {
 					if ( $name->id == $paged_users[$i]->id )
 						$paged_users[$i]->fullname = $name->fullname;
@@ -520,7 +520,7 @@ class BP_Core_User {
 		// Fetch the user's total friend count
 		if ( 'popular' != $type ) {
 			$friend_count = $wpdb->get_results( $wpdb->prepare( "SELECT user_id as id, meta_value as total_friend_count FROM {$wpdb->usermeta} WHERE meta_key = %s AND user_id IN ( {$user_ids} )", bp_get_user_meta_key( 'total_friend_count' ) ) );
-			for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+			for ( $i = 0, $count = count( $paged_users ); $i < $count; ++$i ) {
 				foreach ( (array)$friend_count as $count ) {
 					if ( $count->id == $paged_users[$i]->id )
 						$paged_users[$i]->total_friend_count = (int)$count->total_friend_count;
@@ -531,7 +531,7 @@ class BP_Core_User {
 		// Fetch whether or not the user is a friend
 		if ( bp_is_active( 'friends' ) ) {
 			$friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
-			for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+			for ( $i = 0, $count = count( $paged_users ); $i < $count; ++$i ) {
 				foreach ( (array)$friend_status as $status ) {
 					if ( $status->initiator_user_id == $paged_users[$i]->id || $status->friend_user_id == $paged_users[$i]->id )
 						$paged_users[$i]->is_friend = $status->is_confirmed;
@@ -541,7 +541,7 @@ class BP_Core_User {
 
 		if ( 'active' != $type ) {
 			$user_activity = $wpdb->get_results( $wpdb->prepare( "SELECT user_id as id, meta_value as last_activity FROM {$wpdb->usermeta} WHERE meta_key = %s AND user_id IN ( {$user_ids} )", bp_get_user_meta_key( 'last_activity' ) ) );
-			for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+			for ( $i = 0, $count = count( $paged_users ); $i < $count; ++$i ) {
 				foreach ( (array)$user_activity as $activity ) {
 					if ( $activity->id == $paged_users[$i]->id )
 						$paged_users[$i]->last_activity = $activity->last_activity;
@@ -552,7 +552,7 @@ class BP_Core_User {
 		// Fetch the user's last_activity
 		if ( 'active' != $type ) {
 			$user_activity = $wpdb->get_results( $wpdb->prepare( "SELECT user_id as id, meta_value as last_activity FROM {$wpdb->usermeta} WHERE meta_key = %s AND user_id IN ( {$user_ids} )", bp_get_user_meta_key( 'last_activity' ) ) );
-			for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+			for ( $i = 0, $count = count( $paged_users ); $i < $count; ++$i ) {
 				foreach ( (array)$user_activity as $activity ) {
 					if ( $activity->id == $paged_users[$i]->id )
 						$paged_users[$i]->last_activity = $activity->last_activity;
@@ -562,7 +562,7 @@ class BP_Core_User {
 
 		// Fetch the user's latest update
 		$user_update = $wpdb->get_results( $wpdb->prepare( "SELECT user_id as id, meta_value as latest_update FROM {$wpdb->usermeta} WHERE meta_key = %s AND user_id IN ( {$user_ids} )", bp_get_user_meta_key( 'bp_latest_update' ) ) );
-		for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+		for ( $i = 0, $count = count( $paged_users ); $i < $count; ++$i ) {
 			foreach ( (array)$user_update as $update ) {
 				if ( $update->id == $paged_users[$i]->id )
 					$paged_users[$i]->latest_update = $update->latest_update;
Index: bp-core/bp-core-functions.php
===================================================================
--- bp-core/bp-core-functions.php
+++ bp-core/bp-core-functions.php
@@ -642,7 +642,7 @@ function bp_core_time_since( $older_date, $newer_date = false ) {
 	} else {
 
 		// Step one: the first chunk
-		for ( $i = 0, $j = count($chunks); $i < $j; $i++) {
+		for ( $i = 0, $j = count( $chunks ); $i < $j; ++$i ) {
 			$seconds = $chunks[$i][0];
 
 			// Finding the biggest chunk (if the chunk fits, break)
Index: bp-forums/bp-forums-functions.php
===================================================================
--- bp-forums/bp-forums-functions.php
+++ bp-forums/bp-forums-functions.php
@@ -320,7 +320,7 @@ function bp_forums_get_topic_extras( $topics ) {
 
 	// Fetch the topic's last poster details
 	$poster_details = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, t.topic_last_poster, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$wpdb->users} u, {$bbdb->topics} t WHERE u.ID = t.topic_last_poster AND t.topic_id IN ( {$topic_ids} )" ) );
-	for ( $i = 0; $i < count( $topics ); $i++ ) {
+	for ( $i = 0, $count = count( $topics ); $i < $count; ++$i ) {
 		foreach ( (array)$poster_details as $poster ) {
 			if ( $poster->topic_id == $topics[$i]->topic_id ) {
 				$topics[$i]->topic_last_poster_email       = $poster->user_email;
@@ -334,7 +334,7 @@ function bp_forums_get_topic_extras( $topics ) {
 	// Fetch fullname for the topic's last poster
 	if ( bp_is_active( 'xprofile' ) ) {
 		$poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" ) );
-		for ( $i = 0; $i < count( $topics ); $i++ ) {
+		for ( $i = 0, $count = count( $topics ); $i < $count; ++$i ) {
 			foreach ( (array)$poster_names as $name ) {
 				if ( $name->topic_id == $topics[$i]->topic_id )
 					$topics[$i]->topic_last_poster_displayname = $name->value;
@@ -438,7 +438,7 @@ function bp_forums_get_post_extras( $posts ) {
 	// Fetch the poster's user_email, user_nicename and user_login
 	$poster_details = $wpdb->get_results( $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$wpdb->users} u WHERE u.ID IN ( {$user_ids} )" ) );
 
-	for ( $i = 0; $i < count( $posts ); $i++ ) {
+	for ( $i = 0, $count = count( $posts ); $i < $count; ++$i ) {
 		foreach ( (array)$poster_details as $poster ) {
 			if ( $poster->user_id == $posts[$i]->poster_id ) {
 				$posts[$i]->poster_email    = $poster->user_email;
@@ -452,7 +452,7 @@ function bp_forums_get_post_extras( $posts ) {
 	// Fetch fullname for each poster.
 	if ( bp_is_active( 'xprofile' ) ) {
 		$poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id, pd.value FROM {$bp->profile->table_name_data} pd WHERE pd.user_id IN ( {$user_ids} )" ) );
-		for ( $i = 0; $i < count( $posts ); $i++ ) {
+		for ( $i = 0, $count = count( $posts ); $i < $count; ++$i ) {
 			foreach ( (array)$poster_names as $name ) {
 				if ( isset( $topics[$i] ) && $name->user_id == $topics[$i]->user_id )
 				$posts[$i]->poster_name = $poster->value;
Index: bp-friends/bp-friends-classes.php
===================================================================
--- bp-friends/bp-friends-classes.php
+++ bp-friends/bp-friends-classes.php
@@ -98,7 +98,7 @@ class BP_Friends_Friendship {
 		$friends = $wpdb->get_results( $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} $friend_sql $oc_sql ORDER BY date_created DESC" ) );
 		$fids = array();
 
-		for ( $i = 0; $i < count($friends); $i++ ) {
+		for ( $i = 0, $count = count( $friends ); $i < $count; ++$i ) {
 			if ( $assoc_arr )
 				$fids[] = array( 'user_id' => ( $friends[$i]->friend_user_id == $user_id ) ? $friends[$i]->initiator_user_id : $friends[$i]->friend_user_id );
 			else
@@ -280,12 +280,12 @@ class BP_Friends_Friendship {
 		$sql = $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} WHERE (friend_user_id = %d || initiator_user_id = %d) && is_confirmed = 1 ORDER BY rand() LIMIT %d", $user_id, $user_id, $total_friends );
 		$results = $wpdb->get_results($sql);
 
-		for ( $i = 0; $i < count($results); $i++ ) {
+		for ( $i = 0, $count = count( $results ); $i < $count; ++$i ) {
 			$fids[] = ( $results[$i]->friend_user_id == $user_id ) ? $results[$i]->initiator_user_id : $results[$i]->friend_user_id;
 		}
 
 		// remove duplicates
-		if ( count($fids) > 0 )
+		if ( count( $fids ) > 0 )
 			return array_flip(array_flip($fids));
 		else
 			return false;
@@ -297,7 +297,7 @@ class BP_Friends_Friendship {
 		$friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
 
 		$invitable_count = 0;
-		for ( $i = 0; $i < count($friend_ids); $i++ ) {
+		for ( $i = 0, $count = count( $friend_ids ); $i < $count; ++$i ) {
 
 			if ( BP_Groups_Member::check_is_member( (int)$friend_ids[$i], $group_id ) )
 				continue;
Index: bp-friends/bp-friends-functions.php
===================================================================
--- bp-friends/bp-friends-functions.php
+++ bp-friends/bp-friends-functions.php
@@ -244,8 +244,8 @@ function friends_search_users( $search_terms, $user_id, $pag_num = 0, $pag_page
 	if ( !$user_ids )
 		return false;
 
-	for ( $i = 0; $i < count( $user_ids ); $i++  )
-		$users[] = new BP_Core_User($user_ids[$i]);
+	for ( $i = 0, $count = count( $user_ids ); $i < $count; ++$i )
+		$users[] = new BP_Core_User( $user_ids[$i] );
 
 	return array( 'users' => $users, 'count' => BP_Friends_Friendship::search_users_count( $search_terms ) );
 }
Index: bp-friends/bp-friends-template.php
===================================================================
--- bp-friends/bp-friends-template.php
+++ bp-friends/bp-friends-template.php
@@ -92,7 +92,7 @@ function bp_friends_random_friends() {
 
 			<ul class="horiz-gallery">
 
-			<?php for ( $i = 0; $i < count( $friend_ids ); $i++ ) { ?>
+			<?php for ( $i = 0, $count = count( $friend_ids ); $i < $count; ++$i ) { ?>
 
 				<li>
 					<a href="<?php echo bp_core_get_user_domain( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
@@ -138,7 +138,7 @@ function bp_friends_random_members( $total_members = 5 ) {
 
 		<ul class="item-list" id="random-members-list">
 
-		<?php for ( $i = 0; $i < count( $user_ids['users'] ); $i++ ) { ?>
+		<?php for ( $i = 0, $count = count( $user_ids['users'] ); $i < $count; ++$i ) { ?>
 
 			<li>
 				<a href="<?php echo bp_core_get_user_domain( $user_ids['users'][$i]->id ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $user_ids['users'][$i]->id, 'type' => 'thumb' ) ) ?></a>
Index: bp-groups/bp-groups-classes.php
===================================================================
--- bp-groups/bp-groups-classes.php
+++ bp-groups/bp-groups-classes.php
@@ -541,7 +541,7 @@ Class BP_Groups_Group {
 
 		/* Fetch the logged in users status within each group */
 		$user_status = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_confirmed = 1 AND is_banned = 0", $bp->loggedin_user->id ) );
-		for ( $i = 0; $i < count( $paged_groups ); $i++ ) {
+		for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
 			$paged_groups[$i]->is_member = false;
 
 			foreach ( (array)$user_status as $group_id ) {
@@ -551,7 +551,7 @@ Class BP_Groups_Group {
 		}
 
 		$user_banned = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE is_banned = 1 AND user_id = %d AND group_id IN ( {$group_ids} )", $bp->loggedin_user->id ) );
-		for ( $i = 0; $i < count( $paged_groups ); $i++ ) {
+		for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
 			$paged_groups[$i]->is_banned = false;
 
 			foreach ( (array)$user_banned as $group_id ) {
@@ -1105,7 +1105,7 @@ Class BP_Groups_Member {
 
 		if ( bp_is_active( 'friends' ) ) {
 			$friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
-			for ( $i = 0; $i < count( $members ); $i++ ) {
+			for ( $i = 0, $count = count( $members ); $i < $count; ++$i ) {
 				foreach ( (array)$friend_status as $status ) {
 					if ( $status->initiator_user_id == $members[$i]->user_id || $status->friend_user_id == $members[$i]->user_id )
 						$members[$i]->is_friend = $status->is_confirmed;
Index: bp-groups/bp-groups-functions.php
===================================================================
--- bp-groups/bp-groups-functions.php
+++ bp-groups/bp-groups-functions.php
@@ -644,7 +644,7 @@ function groups_send_invites( $user_id, $group_id ) {
 	$invited_users = groups_get_invites_for_group( $user_id, $group_id );
 	$group = new BP_Groups_Group( $group_id );
 
-	for ( $i = 0; $i < count( $invited_users ); $i++ ) {
+	for ( $i = 0, $count = count( $invited_users ); $i < $count; ++$i ) {
 		$member = new BP_Groups_Member( $invited_users[$i], $group_id );
 
 		// Send the actual invite
@@ -778,7 +778,7 @@ function groups_send_membership_request( $requesting_user_id, $group_id ) {
 		require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
 
 		// Saved okay, now send the email notification
-		for ( $i = 0; $i < count( $admins ); $i++ )
+		for ( $i = 0, $count = count( $admins ); $i < $count; ++$i )
 			groups_notification_new_membership_request( $requesting_user_id, $admins[$i]->user_id, $group_id, $requesting_user->id );
 
 		do_action( 'groups_membership_requested', $requesting_user_id, $admins, $group_id, $requesting_user->id );
Index: bp-groups/bp-groups-template.php
===================================================================
--- bp-groups/bp-groups-template.php
+++ bp-groups/bp-groups-template.php
@@ -2199,7 +2199,7 @@ function bp_new_group_invite_friend_list() {
 		if ( $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $group_id ) ) {
 			$invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_id );
 
-			for ( $i = 0; $i < count( $friends ); $i++ ) {
+			for ( $i = 0, $count = count( $friends ); $i < $count; ++$i ) {
 				$checked = '';
 
 				if ( !empty( $invites ) ) {
Index: bp-members/bp-members-buddybar.php
===================================================================
--- bp-members/bp-members-buddybar.php
+++ bp-members/bp-members-buddybar.php
@@ -20,7 +20,7 @@ function bp_adminbar_notifications_menu() {
 
 	if ( $notifications ) {
 		$counter = 0;
-		for ( $i = 0; $i < count($notifications); $i++ ) {
+		for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {
 			$alt = ( 0 == $counter % 2 ) ? ' class="alt"' : ''; ?>
 
 			<li<?php echo $alt ?>><?php echo $notifications[$i] ?></li>
Index: bp-members/bp-members-notifications.php
===================================================================
--- bp-members/bp-members-notifications.php
+++ bp-members/bp-members-notifications.php
@@ -49,7 +49,7 @@ function bp_core_get_notifications_for_user( $user_id, $format = 'simple' ) {
 	$notifications = BP_Core_Notification::get_all_for_user( $user_id );
 
 	// Group notifications by component and component_action and provide totals
-	for ( $i = 0; $i < count($notifications); $i++ ) {
+	for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {
 		$notification = $notifications[$i];
 		$grouped_notifications[$notification->component_name][$notification->component_action][] = $notification;
 	}
Index: bp-messages/bp-messages-classes.php
===================================================================
--- bp-messages/bp-messages-classes.php
+++ bp-messages/bp-messages-classes.php
@@ -175,7 +175,7 @@ Class BP_Messages_Thread {
 			return false;
 
 		$count = 0;
-		for ( $i = 0; $i < count( $unread_counts ); $i++ ) {
+		for ( $i = 0, $count = count( $unread_counts ); $i < $count; ++$i ) {
 			$count += $unread_counts[$i]->unread_count;
 		}
 
@@ -341,7 +341,7 @@ Class BP_Messages_Message {
 			return false;
 
 		if ( is_array( $recipient_usernames ) ) {
-			for ( $i = 0; $i < count($recipient_usernames); $i++ ) {
+			for ( $i = 0, $count = count( $recipient_usernames ); $i < $count; ++$i ) {
 				if ( $rid = bp_core_get_userid( trim($recipient_usernames[$i]) ) )
 					$recipient_ids[] = $rid;
 			}
Index: bp-messages/bp-messages-functions.php
===================================================================
--- bp-messages/bp-messages-functions.php
+++ bp-messages/bp-messages-functions.php
@@ -135,7 +135,7 @@ function messages_delete_thread( $thread_ids ) {
 
 	if ( is_array( $thread_ids ) ) {
 		$error = 0;
-		for ( $i = 0; $i < count( $thread_ids ); $i++ ) {
+		for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
 			if ( !$status = BP_Messages_Thread::delete( $thread_ids[$i]) )
 				$error = 1;
 		}
Index: bp-themes/bp-default/_inc/ajax.php
===================================================================
--- bp-themes/bp-default/_inc/ajax.php
+++ bp-themes/bp-default/_inc/ajax.php
@@ -558,7 +558,7 @@ function bp_dtheme_ajax_message_markunread() {
 	} else {
 		$thread_ids = explode( ',', $_POST['thread_ids'] );
 
-		for ( $i = 0; $i < count($thread_ids); $i++ ) {
+		for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
 			BP_Messages_Thread::mark_as_unread($thread_ids[$i]);
 		}
 	}
@@ -574,7 +574,7 @@ function bp_dtheme_ajax_message_markread() {
 	} else {
 		$thread_ids = explode( ',', $_POST['thread_ids'] );
 
-		for ( $i = 0; $i < count($thread_ids); $i++ ) {
+		for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
 			BP_Messages_Thread::mark_as_read($thread_ids[$i]);
 		}
 	}
@@ -590,10 +590,10 @@ function bp_dtheme_ajax_messages_delete() {
 	} else {
 		$thread_ids = explode( ',', $_POST['thread_ids'] );
 
-		for ( $i = 0; $i < count($thread_ids); $i++ )
+		for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i )
 			BP_Messages_Thread::delete($thread_ids[$i]);
 
-		_e('Messages deleted.', 'buddypress');
+		_e( 'Messages deleted.', 'buddypress' );
 	}
 }
 add_action( 'wp_ajax_messages_delete', 'bp_dtheme_ajax_messages_delete' );
Index: bp-xprofile/bp-xprofile-classes.php
===================================================================
--- bp-xprofile/bp-xprofile-classes.php
+++ bp-xprofile/bp-xprofile-classes.php
@@ -72,7 +72,7 @@ Class BP_XProfile_Group {
 			/* Remove the group's fields. */
 			if ( BP_XProfile_Field::delete_for_group( $this->id ) ) {
 				/* Remove profile data for the groups fields */
-				for ( $i = 0; $i < count( $this->fields ); $i++ ) {
+				for ( $i = 0, $count = count( $this->fields ); $i < $count; ++$i ) {
 					BP_XProfile_ProfileData::delete_for_field( $this->fields[$i]->id );
 				}
 			}
@@ -586,12 +586,12 @@ Class BP_XProfile_Field {
 									$_POST["isDefault_{$type}_option"][$i]
 						);
 
-						$i++;
+						++$i;
 					}
 				}
 
 				if ( !empty( $options ) ) {
-					for ( $i = 0; $i < count( $options ); $i++ ) {
+					for ( $i = 0, $count = count( $options ); $i < $count; ++$i ) {
 						$j = $i + 1;
 
 						if ( 'multiselectbox' == $type || 'checkbox' == $type )
@@ -910,7 +910,7 @@ Class BP_XProfile_ProfileData {
 		$field_sql = '';
 
 		if ( is_array( $fields ) ) {
-			for ( $i = 0; $i < count( $fields ); $i++ ) {
+			for ( $i = 0, $count = count( $fields ); $i < $count; ++$i ) {
 				if ( $i == 0 )
 					$field_sql .= $wpdb->prepare( "AND ( f.name = %s ", $fields[$i] );
 				else
@@ -930,7 +930,7 @@ Class BP_XProfile_ProfileData {
 		$new_values = array();
 
 		if ( is_array( $fields ) ) {
-			for ( $i = 0; $i < count( $values ); $i++ ) {
+			for ( $i = 0, $count = count( $values ); $i < $count; ++$i ) {
 				for ( $j = 0; $j < count( $fields ); $j++ ) {
 					if ( $values[$i]->name == $fields[$j] )
 						$new_values[$fields[$j]] = $values[$i]->value;
Index: bp-xprofile/bp-xprofile-template.php
===================================================================
--- bp-xprofile/bp-xprofile-template.php
+++ bp-xprofile/bp-xprofile-template.php
@@ -102,7 +102,7 @@ Class BP_XProfile_Data_Template {
 	function has_fields() {
 		$has_data = false;
 
-		for ( $i = 0; $i < count( $this->group->fields ); $i++ ) {
+		for ( $i = 0, $count = count( $this->group->fields ); $i < $count; ++$i ) {
 			$field = &$this->group->fields[$i];
 
 			if ( !empty( $field->data ) && $field->data->value != null ) {
@@ -547,7 +547,7 @@ function bp_the_profile_field_options( $args = '' ) {
 					case 'day':
 						$html .= '<option value=""' . selected( $day, '', false ) . '>--</option>';
 
-						for ( $i = 1; $i < 32; $i++ ) {
+						for ( $i = 1; $i < 32; ++$i ) {
 							$html .= '<option value="' . $i .'"' . selected( $day, $i, false ) . '>' . $i . '</option>';
 						}
 						break;
@@ -563,7 +563,7 @@ function bp_the_profile_field_options( $args = '' ) {
 
 						$html .= '<option value=""' . selected( $month, '', false ) . '>------</option>';
 
-						for ( $i = 0; $i < 12; $i++ ) {
+						for ( $i = 0; $i < 12; ++$i ) {
 							$html .= '<option value="' . $eng_months[$i] . '"' . selected( $month, $eng_months[$i], false ) . '>' . $months[$i] . '</option>';
 						}
 						break;
@@ -633,7 +633,7 @@ function bp_profile_group_tabs() {
 		$group_name = bp_profile_group_name(false);
 
 	$tabs = array();
-	for ( $i = 0, $count = count( $groups ); $i < $count; $i++ ) {
+	for ( $i = 0, $count = count( $groups ); $i < $count; ++$i ) {
 		if ( $group_name == $groups[$i]->name )
 			$selected = ' class="current"';
 		else