Changeset 2077

trunk/bp-activity.php

-                      r2002
+                      r2077
 /* Include deprecated functions if settings allow */
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
     require ( BP_PLUGIN_DIR . '/bp-activity/deprecated/bp-activity-deprecated.php' );
+    require ( BP_PLUGIN_DIR . '/bp-activity/deprecated/bp-activity-deprecated.php' );
 function bp_activity_install() {
     global $wpdb, $bp;
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     $sql[] = "CREATE TABLE {$bp->activity->table_name} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta($sql);
     /* Drop the old sitewide and user activity tables */
     $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->base_prefix}bp_activity_user_activity" );
     $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->base_prefix}bp_activity_sitewide" );
     /* TODO: Rename the old user activity cached table */
     //$wpdb->query( "RENAME TABLE {$wpdb->base_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
 …
     /* Internal identifier */
     $bp->activity->id = 'activity';
     $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity_user_activity_cached';
     $bp->activity->slug = BP_ACTIVITY_SLUG;
     /* Register this in the active components array */
     $bp->active_components[$bp->activity->slug] = $bp->activity->id;
     do_action( 'bp_activity_setup_globals' );
+}
 …
 add_action( 'admin_menu', 'bp_activity_setup_globals', 2 );
 function bp_activity_check_installed() {
+function bp_activity_check_installed() {
     global $wpdb, $bp;
     if ( get_site_option('bp-activity-db-version') < BP_ACTIVITY_DB_VERSION )
         bp_activity_install();
 …
         } else {
             $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
             $bp->bp_options_title = $bp->displayed_user->fullname;
+            $bp->bp_options_title = $bp->displayed_user->fullname;
+        }
+    }
 …
 function bp_activity_screen_my_activity() {
     do_action( 'bp_activity_screen_my_activity' );
     bp_core_load_template( apply_filters( 'bp_activity_template_my_activity', 'activity/just-me' ) );
+    bp_core_load_template( apply_filters( 'bp_activity_template_my_activity', 'activity/just-me' ) );
+}
 function bp_activity_screen_friends_activity() {
     do_action( 'bp_activity_screen_friends_activity' );
     bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'activity/my-friends' ) );
+    bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'activity/my-friends' ) );
+}
 …
     /* Check the nonce */
     check_admin_referer( 'bp_activity_delete_link' );
     $activity_id = $bp->action_variables[0];
     /* Check access */
     if ( !is_site_admin() ) {
         $activity = new BP_Activity_Activity( $activity_id );
         if ( $activity->user_id != $bp->loggedin_user->id )
             return false;
+    }
     /* Now delete the activity item */
     if ( bp_activity_delete_by_activity_id( $activity_id ) )
 …
     else
         bp_core_add_message( __( 'There was an error when deleting that activity', 'buddypress' ), 'error' );
     do_action( 'bp_activity_action_delete_activity', $activity_id );
     bp_core_redirect( $_SERVER['HTTP_REFERER'] );
+}
 …
 function bp_activity_action_personal_feed() {
     global $bp, $wp_query;
+    global $bp, $wp_query;
     if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'feed' )
         return false;
     $wp_query->is_404 = false;
     status_header( 200 );
 …
         return false;
     $wp_query->is_404 = false;
+    $wp_query->is_404 = false;
     status_header( 200 );
     include_once( 'bp-activity/feeds/bp-activity-friends-feed.php' );
     die;
+    die;
+}
 add_action( 'wp', 'bp_activity_action_friends_feed', 3 );
 …
 function bp_activity_add( $args = '' ) {
     global $bp, $wpdb;
     $defaults = array(
         'content' => false, // The content of the activity item
 …
         'component_name' => false, // The name/ID of the component e.g. groups, profile, mycomponent
         'component_action' => false, // The component action e.g. new_wire_post, profile_updated
         'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
         'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id, or wire_post_id
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     /* Insert the "time-since" placeholder */
     if ( $content )
 …
     $activity->date_recorded = $recorded_time;
     $activity->hide_sitewide = $hide_sitewide;
     if ( !$activity->save() )
         return false;
     do_action( 'bp_activity_add', $args );
     return true;
+}
 …
     do_action( 'bp_activity_delete_by_activity_id', $activity_id );
     return true;
+    return true;
+}
 …
     do_action( 'bp_activity_delete_for_user_by_component', $user_id, $component_name );
     return true;
+}
 …
 function bp_activity_add_timesince_placeholder( $content ) {
     /* Check a time-since span doesn't already exist */
     if ( false === strpos( $content, '<span class="time-since">' ) ) {
+    if ( false === strpos( $content, '<span class="time-since">' ) ) {
         if ( !$pos = strpos( $content, '<blockquote' ) ) {
             if ( !$pos = strpos( $content, '<div' ) ) {
 …
+        }
+    }
     if ( (int) $pos ) {
         $before = substr( $content, 0, (int) $pos );
         $after = substr( $content, (int) $pos, strlen( $content ) );
         $content = $before . ' <span class="time-since">%s</span>' . $after;
+    }
 …
+}
 function bp_activity_set_action( $component_id, $key, $value ) {
     global $bp;
     if ( empty( $component_id ) || empty( $key ) || empty( $value ) )
         return false;
     $bp->activity->actions->{$component_id}->{$key} = apply_filters( 'bp_activity_set_action', array(
         'key' => $key,
         'value' => $value
     ), $component_id, $key, $value );
+}
 function bp_activity_get_action( $component_id, $key ) {
     global $bp;
     if ( empty( $component_id ) || empty( $key ) )
         return false;
     return apply_filters( 'bp_activity_get_action', $bp->activity->actions->{$component_id}->{$key}, $component_id, $key );
+}
+function bp_activity_set_action( $component_id, $key, $value ) {
+    global $bp;
+    if ( empty( $component_id ) || empty( $key ) || empty( $value ) )
+        return false;
+    $bp->activity->actions->{$component_id}->{$key} = apply_filters( 'bp_activity_set_action', array(
+        'key' => $key,
+        'value' => $value
+    ), $component_id, $key, $value );
+}
+function bp_activity_get_action( $component_id, $key ) {
+    global $bp;
+    if ( empty( $component_id ) || empty( $key ) )
+        return false;
+    return apply_filters( 'bp_activity_get_action', $bp->activity->actions->{$component_id}->{$key}, $component_id, $key );
+}
 function bp_activity_check_exists_by_content( $content ) {
 …
     // Clear the user's activity from the sitewide stream and clear their activity tables
     BP_Activity_Activity::delete_for_user( $user_id );
     do_action( 'bp_activity_remove_data', $user_id );
+}
 …
 /* Ordering function - don't call this directly */
 function bp_activity_order_by_date( $a, $b ) {
     return apply_filters( 'bp_activity_order_by_date', strcasecmp( $b['date_recorded'], $a['date_recorded'] ) );
+    return apply_filters( 'bp_activity_order_by_date', strcasecmp( $b['date_recorded'], $a['date_recorded'] ) );
+}

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

-                      r2036
+                      r2077
     var $date_recorded;
     var $hide_sitewide = false;
     function bp_activity_activity( $id = false ) {
         global $bp;
         if ( $id ) {
             $this->id = $id;
 …
+        }
+    }
     function populate() {
         global $wpdb, $bp;
         $activity = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
         $this->id = $activity->id;
         $this->item_id = $activity->item_id;
 …
         $this->hide_sitewide = $activity->hide_sitewide;
+    }
     function save() {
         global $wpdb, $bp, $current_user;
         do_action( 'bp_activity_before_save', $this );
         if ( !$this->component_name || !$this->component_action )
             return false;
         /***
          * Before v1.1 of BuddyPress, activity content was calculated at a later point. This is no longer the
 …
                 if ( !$fetched_content = call_user_func( $bp->{$this->component_name}->format_activity_function, $this->item_id, $this->user_id, $this->component_action, $this->secondary_item_id, $this->for_secondary_user ) )
                     return false;
                 $this->content = $fetched_content['content'];
                 $this->primary_link = $fetched_content['primary_link'];
+            }
+        }
         if ( !$this->primary_link )
             $this->primary_link = $bp->loggedin_user->domain;
         if ( $existing_activity_id = $this->exists() )
             BP_Activity_Activity::delete_by_activity_id( $existing_activity_id );
         /* If we have an existing ID, update the activity item, otherwise insert it. */
         if ( $this->id ) {
 …
         return false;
+    }
     function exists() {
         global $wpdb, $bp;
         /* This doesn't seem to be working correctly at the moment, so it is disabled [TODO] */
         return false;
         /* If we have an item id, try and match on that, if not do a content match */
         if ( $this->item_id ) {
             if ( $this->secondary_item_id )
                 $secondary_sql = $wpdb->prepare( " AND secondary_item_id = %s", $secondary_item_id );
             return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND item_id = %s{$secondary_sql} AND component_name = %s AND component_action = %s", $this->user_id, $this->item_id, $this->component_name, $this->component_action ) );
+            return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND item_id = %s{$secondary_sql} AND component_name = %s AND component_action = %s", $this->user_id, $this->item_id, $this->component_name, $this->component_action ) );
         } else {
             return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $this->user_id, $this->content, $this->component_name, $this->component_action ) );
+        }
+    }
     /* Static Functions */
+            return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $this->user_id, $this->content, $this->component_name, $this->component_action ) );
+        }
+    }
+    /* Static Functions */
     function delete( $item_id, $component_name, $component_action, $user_id = false, $secondary_item_id = false ) {
 …
         if ( $secondary_item_id )
             $secondary_sql = $wpdb->prepare( "AND secondary_item_id = %s", $secondary_item_id );
         if ( $component_action )
             $component_action_sql = $wpdb->prepare( "AND component_action = %s", $component_action );
         if ( $user_id )
             $user_sql = $wpdb->prepare( "AND user_id = %d", $user_id );
 …
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
+    }
     function delete_by_item_id( $item_id, $component_name, $component_action, $user_id = false, $secondary_item_id = false ) {
         return BP_Activity_Activity::delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
 …
     function delete_by_activity_id( $activity_id ) {
         global $bp, $wpdb;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE id = %d", $activity_id ) );
+    }
     function delete_by_content( $user_id, $content, $component_name, $component_action ) {
         global $bp, $wpdb;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $user_id, $content, $component_name, $component_action ) );
+    }
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $user_id, $content, $component_name, $component_action ) );
+    }
     function delete_for_user_by_component( $user_id, $component_name ) {
         global $bp, $wpdb;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND component_name = %s", $user_id, $component_name ) );
+    }
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d AND component_name = %s", $user_id, $component_name ) );
+    }
     function delete_for_user( $user_id ) {
         global $wpdb, $bp;
 …
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE user_id = %d", $user_id ) );
+    }
     function get_activity_for_user( $user_id, $max_items, $limit, $page, $filter ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         if ( $max_items )
             $max_sql = $wpdb->prepare( "LIMIT %d", $max_items );
         /* Sort out filtering */
         if ( $filter )
             $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
         if ( $limit && $page && $max_items )
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $pag_sql", $user_id ) );
         else
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $user_id ) );
         $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $max_sql", $user_id ) );
         return array( 'activities' => $activities, 'total' => (int)$total_activities );
+    }
     function get_activity_for_friends( $user_id, $max_items, $max_items_per_friend, $limit, $page, $filter ) {
         global $wpdb, $bp;
         // TODO: Max items per friend not yet implemented.
         if ( !function_exists('friends_get_friend_user_ids') )
             return false;
 …
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( $max_items )
             $max_sql = $wpdb->prepare( "LIMIT %d", $max_items );
 …
         if ( !$friend_ids )
             return false;
         $friend_ids = implode( ',', $friend_ids );
         if ( $limit && $page && $max_items )
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql"  ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql"  ) );
         else
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql" ) );
         $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $max_sql" ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql" ) );
+        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $max_sql" ) );
         return array( 'activities' => $activities, 'total' => (int)$total_activities );
+    }
     function get_sitewide_activity( $max, $limit, $page, $filter ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( $max )
             $max_sql = $wpdb->prepare( "LIMIT %d", $max );
         /* Sort out filtering */
         if ( $filter )
 …
         return array( 'activities' => $activities, 'total' => (int)$total_activities );
+    }
     function get_recorded_component_names() {
         global $wpdb, $bp;
         return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT component_name FROM {$bp->activity->table_name} ORDER BY component_name ASC" ) );
+    }
     function get_sitewide_items_for_feed( $limit = 35 ) {
         global $wpdb, $bp;
         $activities = bp_activity_get_sitewide_activity( $limit );
         for ( $i = 0; $i < count($activities); $i++ ) {
 …
+        }
         return $activity_feed;
+    }
+        return $activity_feed;
+    }
     function get_filter_sql( $filter_array ) {
         global $wpdb;
         if ( !empty( $filter_array['object'] ) ) {
             $object_filter = explode( ',', $filter_array['object'] );
             $object_sql = ' AND ( ';
             $counter = 1;
             foreach( (array) $object_filter as $object ) {
                 $object_sql .= $wpdb->prepare( "component_name = %s", trim( $object ) );
                 if ( $counter != count( $object_filter ) )
                     $object_sql .= ' || ';
                 $counter++;
+            }
             $object_sql .= ' )';
+        }
 …
             $action_filter = explode( ',', $filter_array['action'] );
             $action_sql = ' AND ( ';
             $counter = 1;
             foreach( (array) $action_filter as $action ) {
                 $action_sql .= $wpdb->prepare( "component_action = %s", trim( $action ) );
                 if ( $counter != count( $action_filter ) )
                     $action_sql .= ' || ';
                 $counter++;
+            }
             $action_sql .= ' )';
+        }
 …
             $pid_filter = explode( ',', $filter_array['primary_id'] );
             $pid_sql = ' AND ( ';
             $counter = 1;
             foreach( (array) $pid_filter as $pid ) {
                 $pid_sql .= $wpdb->prepare( "item_id = %s", trim( $pid ) );
                 if ( $counter != count( $pid_filter ) )
                     $pid_sql .= ' || ';
                 $counter++;
+            }
             $pid_sql .= ' )';
+        }
 …
             $sid_filter = explode( ',', $filter_array['secondary_id'] );
             $sid_sql = ' AND ( ';
             $counter = 1;
             foreach( (array) $sid_filter as $sid ) {
                 $sid_sql .= $wpdb->prepare( "secondary_item_id = %s", trim( $sid ) );
                 if ( $counter != count( $sid_filter ) )
                     $sid_sql .= ' || ';
                 $counter++;
+            }
             $sid_sql .= ' )';
+        }
         return $object_sql . $action_sql . $pid_sql . $sid_sql;
+    }
     function get_last_updated() {
         global $bp, $wpdb;
         return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded ASC LIMIT 1" ) );
+    }
     function check_exists_by_content( $content ) {
         global $wpdb, $bp;

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

-                      r2055
+                      r2077
 function bp_activity_filter_kses( $content ) {
     global $allowedtags;
     $activity_allowedtags = $allowedtags;
     $activity_allowedtags['span'] = array();
     $activity_allowedtags['span']['class'] = array();
     $activity_allowedtags['a']['class'] = array();
     $activity_allowedtags['img'] = array();
+    $activity_allowedtags['img'] = array();
     $activity_allowedtags['img']['src'] = array();
     $activity_allowedtags['img']['alt'] = array();

trunk/bp-activity/bp-activity-templatetags.php

-                      r2071
+                      r2077
     var $activity;
     var $activity_type;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
 …
         if ( $type == 'sitewide' )
             $this->activities = bp_activity_get_sitewide_activity( $max, $this->pag_num, $this->pag_page, $filter );
         if ( $type == 'personal' )
             $this->activities = bp_activity_get_user_activity( $user_id, $max, $this->pag_num, $this->pag_page, $filter );
 …
         if ( $type == 'friends' && ( bp_is_home() || is_site_admin() || $bp->loggedin_user->id == $user_id ) )
             $this->activities = bp_activity_get_friends_activity( $user_id, $max, false, $this->pag_num, $this->pag_page, $filter );
         if ( !$max || $max >= (int)$this->activities['total'] )
             $this->total_activity_count = (int)$this->activities['total'];
         else
             $this->total_activity_count = (int)$max;
         $this->activities = $this->activities['activities'];
         if ( $max ) {
             if ( $max >= count($this->activities) )
 …
             $this->activity_count = count($this->activities);
+        }
         $this->full_name = $bp->displayed_user->fullname;
 …
+        }
+    }
     function has_activities() {
         if ( $this->activity_count )
             return true;
         return false;
+    }
     function next_activity() {
         $this->current_activity++;
         $this->activity = $this->activities[$this->current_activity];
         return $this->activity;
+    }
     function rewind_activities() {
         $this->current_activity = -1;
 …
+        }
+    }
     function user_activities() {
+    function user_activities() {
         if ( $this->current_activity + 1 < $this->activity_count ) {
             return true;
 …
         return false;
+    }
     function the_activity() {
         global $activity;
 …
         $this->in_the_loop = true;
         $this->activity = $this->next_activity();
         if ( is_array( $this->activity ) )
             $this->activity = (object) $this->activity;
 …
 function bp_has_activities( $args = '' ) {
     global $bp, $activities_template;
     /* Note: any params used for filtering can be a single value, or multiple values comma separated. */
     $defaults = array(
         'type' => 'sitewide',
 …
             $per_page = $max;
+    }
     if ( isset( $_GET['afilter'] ) )
         $filter = array( 'object' => $_GET['afilter'] );
     else
         $filter = array( 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
     $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $filter );
+    $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $filter );
     return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );
+}
 …
 function bp_activity_pagination_count() {
     global $bp, $activities_template;
     $from_num = intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1;
     $to_num = ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1) ;
 …
     function bp_get_activity_pagination_links() {
         global $activities_template;
         return apply_filters( 'bp_get_activity_pagination_links', $activities_template->pag_links );
+    }
 …
 function bp_activities_title() {
     global $bp_activity_title;
     echo bp_get_activities_title();
+}
 …
 function bp_activities_no_activity() {
     global $bp_activity_no_activity;
     echo bp_get_activities_no_activity();
+}
     function bp_get_activities_no_activity() {
         global $bp_activity_no_activity;
         return apply_filters( 'bp_get_activities_no_activity', $bp_activity_no_activity );
+    }
 …
             'height' => 20,
             'class' => 'avatar',
             'alt' => __( 'Avatar', 'buddypress' )
+            'alt' => __( 'Avatar', 'buddypress' )
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         $item_id = false;
         if ( (int)$activities_template->activity->user_id )
 …
         if ( $bp->blogs->id == $activities_template->activity->component_name && !(int) $activities_template->activity->user_id )
             $object = 'blog';
         $object = apply_filters( 'bp_get_activity_avatar_object_' . $activities_template->activity->component_name, $object );
         return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height ) ) );
+    }
 …
         if ( bp_is_home() && $activities_template->activity_type == 'personal' )
             $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name );
+            $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name );
         else
             $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name, true, false, false );
 …
         /* Add 'the_content' filter to activity to allow existing plugins to replace text as they would on post text. (extra smilies etc) */
         $content = apply_filters( 'the_content', $content );
         return apply_filters( 'bp_get_activity_content', $content );
+    }
 …
 function bp_activity_content_filter( $content, $date_recorded, $full_name, $insert_time = true, $filter_words = true, $filter_you = true ) {
     global $activities_template, $bp;
     if ( !$content )
         return false;
     /* Split the content so we don't evaluate and replace text on content we don't want to */
     $content = explode( '%s', $content );
 …
     if ( $insert_time )
         $content[0] = bp_activity_insert_time_since( $content[0], $date_recorded );
     // The "You" and "Your" conversion is only done in english, if a translation file is present
     // then do not translate as it causes problems in other languages.
 …
         /* Remove the 'You' and replace if with the persons name */
         if ( $filter_you && $full_name != '' ) {
             $content[0] = preg_replace( "/{$full_name}[<]/", 'You<', $content[0], 1 );
+            $content[0] = preg_replace( "/{$full_name}[<]/", 'You<', $content[0], 1 );
+        }
+    }
 …
     /* Add the delete link if the user has permission on this item */
     if ( ( $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() )
         $content[1] = '</span> <span class="activity-delete-link">' . bp_get_activity_delete_link() . '</span>' . $content[1];
+        $content[1] = '</span> <span class="activity-delete-link">' . bp_get_activity_delete_link() . '</span>' . $content[1];
     $content_new = '';
     for ( $i = 0; $i < count($content); $i++ )
         $content_new .= $content[$i];
     return apply_filters( 'bp_activity_content_filter', $content_new );
+}
 …
     // Make sure we don't have any URL encoding in links when trying to insert the time.
     $content = urldecode($content);
     return apply_filters( 'bp_activity_insert_time_since', @sprintf( $content, @sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( strtotime( $date ) ) ) ) );
+}
 …
     function bp_get_activity_css_class() {
         global $activities_template;
         return apply_filters( 'bp_get_activity_css_class', $activities_template->activity->component_name );
+    }
 …
     function bp_get_activity_filter_links( $args = false ) {
         global $activities_template, $bp;
         $defaults = array(
             'style' => 'list'
 …
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         /* Fetch the names of components that have activity recorded in the DB */
         $component_names = BP_Activity_Activity::get_recorded_component_names();
         if ( !$component_names )
             return false;
         foreach ( (array) $component_names as $component_name ) {
             if ( isset( $_GET['afilter'] ) && $component_name == $_GET['afilter'] )
 …
             else
                 unset($selected);
+            $component_name = attribute_escape( $component_name );
             $component_name = attribute_escape( $component_name );
 …
                 break;
+            }
             $link = add_query_arg( 'afilter', $component_name );
             $link = remove_query_arg( 'acpage' , $link );
             $link = apply_filters( 'bp_get_activity_filter_link_href', $link, $component_name );
             /* Make sure all core internal component names are translatable */
             $translatable_component_names = array( __( 'profile', 'buddypress'), __( 'friends', 'buddypress' ), __( 'groups', 'buddypress' ), __( 'status', 'buddypress' ), __( 'blogs', 'buddypress' ) );
             $component_links[] = $before . '<a href="' . attribute_escape( $link ) . '">' . ucwords( __( $component_name, 'buddypress' ) ) . '</a>' . $after;
+        }
 …
         if ( isset( $_GET['afilter'] ) )
             $component_links[] = '<' . $tag . ' id="afilter-clear"><a href="' . attribute_escape( $link ) . '"">' . __( 'Clear Filter', 'buddypress' ) . '</a></' . $tag . '>';
         return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );
+        return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );
+    }
 …
             return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed' );
         else
             return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' );
+            return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' );
+    }
 …
         global $activities_template;
         return apply_filters( 'bp_get_activity_feed_item_title', md5( $activities_template->activity->date_recorded . '-' . $activities_template->activity->content ) );
+        return apply_filters( 'bp_get_activity_feed_item_title', md5( $activities_template->activity->date_recorded . '-' . $activities_template->activity->content ) );
+    }
 …
 function bp_activity_feed_item_description() {
     echo bp_get_activity_feed_item_description();
+    echo bp_get_activity_feed_item_description();
+}
     function bp_get_activity_feed_item_description() {
         global $activities_template;
         return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $activities_template->activity->content ), ENT_COMPAT, 'UTF-8' ) );
+        return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $activities_template->activity->content ), ENT_COMPAT, 'UTF-8' ) );
+    }

trunk/bp-activity/bp-activity-widgets.php

-                      r1926
+                      r2077
     function widget($args, $instance) {
         global $bp;
         extract( $args );
         echo $before_widget;
         echo $before_title
            . $widget_name .
              ' <a class="rss-image" href="' . bp_get_sitewide_activity_feed_link() . '" title="' . __( 'Site Wide Activity RSS Feed', 'buddypress' ) . '">' . __( '[RSS]', 'buddypress' ) . '</a>'
+           . $widget_name .
+             ' <a class="rss-image" href="' . bp_get_sitewide_activity_feed_link() . '" title="' . __( 'Site Wide Activity RSS Feed', 'buddypress' ) . '">' . __( '[RSS]', 'buddypress' ) . '</a>'
            . $after_title; ?>
     <?php if ( bp_has_activities( 'type=sitewide&max=' . $instance['max_items'] . '&per_page=' . $instance['per_page'] ) ) : ?>
 …
                     <?php bp_activity_pagination_count() ?>
                 </div>
                 <div class="pagination-links" id="activity-pag">
                     &nbsp; <?php bp_activity_pagination_links() ?>
                 </div>
             </div>
             <ul id="activity-filter-links">
                 <?php bp_activity_filter_links() ?>
             </ul>
         <?php endif; ?>
         <ul id="site-wide-stream" class="activity-list">
         <?php while ( bp_activities() ) : bp_the_activity(); ?>
 …
                     </div>
                 <?php endif; ?>
                 <?php bp_activity_content() ?>
             </li>
 …
         </div>
     <?php endif;?>
     <?php echo $after_widget; ?>
     <?php

trunk/bp-activity/deprecated/bp-activity-deprecated.php

-                      r1909
+                      r2077
+ *
  * This file contains functions that are deprecated.
  * You should not under any circumstance use these functions as they are
+ * You should not under any circumstance use these functions as they are
  * either no longer valid, or have been replaced with something much more awesome.
+ *
 …
  * Of course, things will still work if you use these functions but you will
  * be the laughing stock of the BuddyPress community. We will all point and laugh at
  * you. You'll also be making things harder for yourself in the long run,
+ * you. You'll also be making things harder for yourself in the long run,
  * and you will miss out on lovely performance and functionality improvements.
+ *
+ *
  * If you've checked you are not using any deprecated functions and finished your little
  * dance, you can add the following line to your wp-config.php file to prevent any of
 …
 function bp_activity_deprecated_globals() {
     global $bp;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
 …
     $bp->activity->image_base = BP_PLUGIN_URL . '/bp-activity/images';
+}
 add_action( 'plugins_loaded', 'bp_activity_deprecated_globals', 5 );
+add_action( 'plugins_loaded', 'bp_activity_deprecated_globals', 5 );
 add_action( 'admin_menu', 'bp_activity_deprecated_globals', 2 );
 …
 function bp_activity_record( $item_id, $component_name, $component_action, $is_private, $secondary_item_id = false, $user_id = false, $secondary_user_id = false, $recorded_time = false ) {
     global $bp, $wpdb;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
 …
     if ( !$recorded_time )
         $recorded_time = time();
     $args = compact( 'user_id', 'content', 'component_name', 'component_action', 'item_id', 'secondary_item_id', 'recorded_time' );
     bp_activity_add( $args );
     if ( $secondary_user_id  ) {
         $hide_sitewide = true;
 …
         bp_activity_add( $args );
+    }
     do_action( 'bp_activity_record', $item_id, $component_name, $component_action, $is_private, $secondary_item_id, $user_id, $secondary_user_id );
     return true;
+}
 /* DEPRECATED - use bp_activity_delete_by_item_id() */
 function bp_activity_delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id ) {
+function bp_activity_delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id ) {
     if ( !bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component_name' => $component_name, 'component_action' => $component_action, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) ) )
         return false;
     do_action( 'bp_activity_delete', $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
     return true;
+}
 …
 function bp_activity_get_list( $user_id, $title, $no_activity, $limit = false ) {
     global $bp_activity_user_id, $bp_activity_limit, $bp_activity_title, $bp_activity_no_activity;
     $bp_activity_user_id = $user_id;
     $bp_activity_limit = $limit;
     $bp_activity_title = $title;
     $bp_activity_no_activity = $no_activity;
     locate_template( array( '/activity/activity-list.php' ), true );
+}
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $template;
     /* Enqueue the structure CSS file to give basic positional formatting for components */
     wp_enqueue_style( 'bp-activity-structure', BP_PLUGIN_URL . '/bp-activity/deprecated/css/structure.css' );
+    wp_enqueue_style( 'bp-activity-structure', BP_PLUGIN_URL . '/bp-activity/deprecated/css/structure.css' );
+}
 add_action( 'bp_styles', 'bp_activity_add_structure_css' );

trunk/bp-blogs.php

-                      r2055
+                      r2077
 /* Include deprecated functions if settings allow */
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
     require ( BP_PLUGIN_DIR . '/bp-blogs/deprecated/bp-blogs-deprecated.php' );
+    require ( BP_PLUGIN_DIR . '/bp-blogs/deprecated/bp-blogs-deprecated.php' );
 function bp_blogs_install() {
     global $wpdb, $bp;
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     $sql[] = "CREATE TABLE {$bp->blogs->table_name} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
                 KEY comment_post_id (comment_post_id)
              ) {$charset_collate};";
     $sql[] = "CREATE TABLE {$bp->blogs->table_name_blogmeta} (
             id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
             KEY meta_key (meta_key)
            ) {$charset_collate};";
     require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
 …
     // On first installation - record all existing blogs in the system.
     if ( !(int)get_site_option( 'bp-blogs-first-install') ) {
         bp_blogs_record_existing_blogs();
         add_site_option( 'bp-blogs-first-install', 1 );
     } else {
         // Import blog titles and descriptions into the blogmeta table
+        // Import blog titles and descriptions into the blogmeta table
         if ( get_site_option( 'bp-blogs-version' ) <= '0.1.5' ) {
             $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp->blogs->table_name ) );
 …
                 $name = get_blog_option( $blog_ids[$i], 'blogname' );
                 $desc = get_blog_option( $blog_ids[$i], 'blogdescription' );
                 bp_blogs_update_blogmeta( $blog_ids[$i], 'name', $name );
                 bp_blogs_update_blogmeta( $blog_ids[$i], 'description', $desc );
 …
+            }
+        }
+    }
+    }
     update_site_option( 'bp-blogs-db-version', BP_BLOGS_DB_VERSION );
+}
 function bp_blogs_check_installed() {
+function bp_blogs_check_installed() {
     global $wpdb, $bp, $userdata;
     if ( is_site_admin() ) {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
 …
 function bp_blogs_setup_globals() {
     global $bp, $wpdb;
     /* For internal identification */
     $bp->blogs->id = 'blogs';
     $bp->blogs->table_name = $wpdb->base_prefix . 'bp_user_blogs';
     $bp->blogs->table_name_blog_posts = $wpdb->base_prefix . 'bp_user_blogs_posts';
 …
     $bp->blogs->format_notification_function = 'bp_blogs_format_notifications';
     $bp->blogs->slug = BP_BLOGS_SLUG;
     /* Register this in the active components array */
     $bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
 …
     do_action( 'bp_blogs_setup_globals' );
+}
 add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );
+add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );
 add_action( 'admin_menu', 'bp_blogs_setup_globals', 2 );
 …
+ *
  * Adds "Blog" to the navigation arrays for the current and logged in user.
+ *
+ *
  * @package BuddyPress Blogs
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_blogs_setup_nav() {
     global $bp;
     /* Add 'Blogs' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __( 'Blogs', 'buddypress' ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
     $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
     /* Add the subnav items to the blogs nav item */
     bp_core_new_subnav_item( array( 'name' => __( 'My Blogs', 'buddypress' ), 'slug' => 'my-blogs', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_my_blogs', 'position' => 10, 'item_css_id' => 'my-blogs-list' ) );
 …
         if ( bp_is_home() ) {
             if ( function_exists('xprofile_setup_nav') ) {
                 $bp->bp_options_title = __('My Blogs', 'buddypress');
+                $bp->bp_options_title = __('My Blogs', 'buddypress');
+            }
         } else {
             /* If we are not viewing the logged in user, set up the current users avatar and name */
             $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
             $bp->bp_options_title = $bp->displayed_user->fullname;
+            $bp->bp_options_title = $bp->displayed_user->fullname;
+        }
+    }
     do_action( 'bp_blogs_setup_nav' );
+}
 …
     if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
         $bp->is_directory = true;
         do_action( 'bp_blogs_directory_blogs_setup' );
         bp_core_load_template( apply_filters( 'bp_blogs_template_directory_blogs_setup', 'directories/blogs/index' ) );
 …
 function bp_blogs_screen_my_blogs() {
     do_action( 'bp_blogs_screen_my_blogs' );
     bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'blogs/my-blogs' ) );
+    bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'blogs/my-blogs' ) );
+}
 …
 function bp_blogs_register_activity_actions() {
     global $bp;
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
 …
 function bp_blogs_record_activity( $args = '' ) {
     global $bp;
     if ( !function_exists( 'bp_activity_add' ) )
         return false;
     /* Because blog, comment, and blog post code execution happens before anything else
        we may need to manually instantiate the activity component globals */
     if ( !$bp->activity && function_exists('bp_activity_setup_globals') )
         bp_activity_setup_globals();
     $defaults = array(
         'user_id' => $bp->loggedin_user->id,
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
+    extract( $r, EXTR_SKIP );
     return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+}
 …
     if ( function_exists('bp_activity_delete_by_item_id') ) {
         extract($args);
         bp_activity_delete_by_item_id( array(
             'item_id' => $item_id,
+        bp_activity_delete_by_item_id( array(
+            'item_id' => $item_id,
             'component_name' => $component_name,
             'component_action' => $component_action,
+            'component_action' => $component_action,
             'user_id' => $user_id,
             'secondary_item_id' => $secondary_item_id
 …
     $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE public = 1 AND mature = 0 AND spam = 0 AND deleted = 0" ) );
     if ( $blog_ids ) {
         foreach( $blog_ids as $blog_id ) {
 …
 function bp_blogs_record_blog( $blog_id, $user_id, $no_activity = true ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     $name = get_blog_option( $blog_id, 'blogname' );
     $description = get_blog_option( $blog_id, 'blogdescription' );
     $recorded_blog = new BP_Blogs_Blog;
     $recorded_blog->user_id = $user_id;
 …
     $recorded_blog_id = $recorded_blog->save();
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'name', $name );
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'description', $description );
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', time() );
     /* Only record this activity if the blog is public */
     if ( (int)$_POST['blog_public'] || !$no_activity ) {
 …
         bp_blogs_record_activity( array(
             'user_id' => $recorded_blog->user_id,
             'content' => apply_filters( 'bp_blogs_activity_created_blog', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
+            'content' => apply_filters( 'bp_blogs_activity_created_blog', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
             'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ),
             'component_action' => 'new_blog',
 …
         ) );
+    }
     do_action( 'bp_blogs_new_blog', &$recorded_blog, $is_private, $is_recorded );
+}
 …
 function bp_blogs_record_post( $post_id, $post, $user_id = false ) {
     global $bp, $wpdb;
     $post_id = (int)$post_id;
     $blog_id = (int)$wpdb->blogid;
     if ( !$user_id )
         $user_id = (int)$post->post_author;
     /* This is to stop infinate loops with Donncha's sitewide tags plugin */
     if ( (int)get_site_option( 'tags_blog_id' ) == (int)$blog_id )
         return false;
     /* Don't record this if it's not a post */
     if ( $post->post_type != 'post' )
         return false;
     if ( !$is_recorded = BP_Blogs_Post::is_recorded( $post_id, $blog_id, $user_id ) ) {
         if ( 'publish' == $post->post_status && '' == $post->post_password ) {
             $recorded_post = new BP_Blogs_Post;
             $recorded_post->user_id = $user_id;
 …
             $recorded_post->post_id = $post_id;
             $recorded_post->date_created = strtotime( $post->post_date );
             $recorded_post_id = $recorded_post->save();
             bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
 …
                 $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
                 $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
                 bp_blogs_record_activity( array(
                     'user_id' => (int)$post->post_author,
                     'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
+                    'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
                     'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
                     'component_action' => 'new_blog_post',
 …
         /* Delete the recorded post if the status is not published or it is password protected */
         if ( 'publish' != $post->post_status || '' != $post->post_password ) {
             return bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
+            return bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
         /* If the post author has changed, delete the post and re-add it. */
         } else if ( (int)$existing_post->user_id != (int)$post->post_author ) {
             // Delete the existing recorded post
             bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
             // Re-record the post with the new author.
             bp_blogs_record_post( $post_id );
+            bp_blogs_record_post( $post_id );
+        }
         if ( (int)get_blog_option( $blog_id, 'blog_public' ) ) {
             /* Now re-record the post in the activity streams */
+            /* Now re-record the post in the activity streams */
             $post_permalink = bp_post_get_permalink( $post, $blog_id );
             $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
             $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
             /* Record this in activity streams */
             bp_blogs_record_activity( array(
                 'user_id' => (int)$post->post_author,
                 'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
+                'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
                 'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
                 'component_action' => 'new_blog_post',
 …
 function bp_blogs_record_comment( $comment_id, $is_approved ) {
     global $wpdb, $bp;
     if ( !$is_approved )
         return false;
     $comment = get_comment($comment_id);
     $comment->post = get_post( $comment->comment_post_ID );
     /* Get the user_id from the author email. */
     $user = get_user_by_email( $comment->comment_author_email );
     $user_id = (int)$user->ID;
     if ( !$user_id )
         return false;
 …
     $recorded_commment_id = $recorded_comment->save();
     bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
 …
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
         $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
+        $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
 …
         bp_blogs_record_activity( array(
             'user_id' => $recorded_comment->user_id,
             'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
+            'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
             'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
             'component_action' => 'new_blog_comment',
 …
 function bp_blogs_approve_comment( $comment_id, $comment_status ) {
     global $bp, $wpdb;
     if ( 'approve' != $comment_status )
         return false;
 …
     $comment = get_comment($comment_id);
     $comment->post = get_post( $comment->comment_post_ID );
     bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
 …
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
         $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
+        $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
 …
         bp_blogs_record_activity( array(
             'user_id' => $recorded_comment->user_id,
             'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
+            'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
             'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
             'component_action' => 'new_blog_comment',
             'item_id' => $comment_id,
             'secondary_item_id' => $recorded_comment->blog_id,
             'recorded_time' =>  $recorded_comment->date_created
+            'recorded_time' =>  $recorded_comment->date_created
         ) );
+    }
 …
 function bp_blogs_unapprove_comment( $comment_id, $comment_status ) {
     if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status )
         bp_blogs_remove_comment( $comment_id );
+        bp_blogs_remove_comment( $comment_id );
+}
 add_action( 'wp_set_comment_status', 'bp_blogs_unapprove_comment', 10, 2 );
 …
     BP_Blogs_Blog::delete_blog_for_all( $blog_id );
     // Delete activity stream item
     bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog' ) );
     do_action( 'bp_blogs_remove_blog', $blog_id );
+}
 …
 function bp_blogs_remove_blog_for_user( $user_id, $blog_id ) {
     global $current_user;
     $blog_id = (int)$blog_id;
     $user_id = (int)$user_id;
 …
     $post_id = (int)$post_id;
     if ( !$blog_id )
         $blog_id = (int)$current_blog->blog_id;
     if ( !$existing_post )
         $existing_post = new BP_Blogs_Post( null, $blog_id, $post_id );
 …
     // Delete post from the bp_blogs table
     BP_Blogs_Post::delete( $post_id, $blog_id );
     // Delete activity stream item
     bp_blogs_delete_activity( array( 'item_id' => $existing_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post' ) );
 …
     $recorded_comment = new BP_Blogs_Comment( false, $wpdb->blogid, $comment_id );
     BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid );
+    BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid );
     // Delete activity stream item
 …
 function bp_blogs_remove_data_for_blog( $blog_id ) {
     global $bp;
     /* If this is regular blog, delete all data for that blog. */
     BP_Blogs_Blog::delete_blog_for_all( $blog_id );
     BP_Blogs_Post::delete_posts_for_blog( $blog_id );
+    BP_Blogs_Post::delete_posts_for_blog( $blog_id );
     BP_Blogs_Comment::delete_comments_for_blog( $blog_id );
 …
 function bp_blogs_get_latest_posts( $blog_id = null, $limit = 5 ) {
     global $bp;
     if ( !is_numeric( $limit ) )
         $limit = 5;
     return BP_Blogs_Post::get_latest_posts( $blog_id, $limit );
+}
 …
 function bp_blogs_total_post_count( $blog_id ) {
     return BP_Blogs_Post::total_post_count( $blog_id );
+}
+}
 function bp_blogs_total_comment_count( $blog_id, $post_id = false ) {
     return BP_Blogs_Post::total_comment_count( $blog_id, $post_id );
+}
+}
 function bp_blogs_is_blog_hidden( $blog_id ) {
 …
 function bp_blogs_redirect_to_random_blog() {
     global $bp, $wpdb;
     if ( $bp->current_component == $bp->blogs->slug && isset( $_GET['random-blog'] ) ) {
         $blog = bp_blogs_get_random_blog();
 …
 function bp_blogs_delete_blogmeta( $blog_id, $meta_key = false, $meta_value = false ) {
     global $wpdb, $bp;
     if ( !is_numeric( $blog_id ) )
         return false;
     $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
     if ( is_array($meta_value) || is_object($meta_value) )
         $meta_value = serialize($meta_value);
     $meta_value = trim( $meta_value );
     if ( !$meta_key ) {
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id ) );
     } else if ( $meta_value ) {
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s AND meta_value = %s", $blog_id, $meta_key, $meta_value ) );
 …
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
+    }
     // TODO need to look into using this.
     // wp_cache_delete($group_id, 'groups');
 …
 function bp_blogs_get_blogmeta( $blog_id, $meta_key = '') {
     global $wpdb, $bp;
     $blog_id = (int) $blog_id;
 …
     if ( !empty($meta_key) ) {
         $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
         // TODO need to look into using this.
         //$user = wp_cache_get($user_id, 'users');
         // Check the cached user object
         //if ( false !== $user && isset($user->$meta_key) )
 …
 function bp_blogs_update_blogmeta( $blog_id, $meta_key, $meta_value ) {
     global $wpdb, $bp;
     if ( !is_numeric( $blog_id ) )
         return false;
     $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
     if ( is_string($meta_value) )
         $meta_value = stripslashes($wpdb->escape($meta_value));
     $meta_value = maybe_serialize($meta_value);
 …
     $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
     if ( !$cur ) {
         $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blogmeta} ( blog_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $blog_id, $meta_key, $meta_value ) );
 …
     /* If this is regular blog, delete all data for that blog. */
     BP_Blogs_Blog::delete_blogs_for_user( $user_id );
     BP_Blogs_Post::delete_posts_for_user( $user_id );
+    BP_Blogs_Post::delete_posts_for_user( $user_id );
     BP_Blogs_Comment::delete_comments_for_user( $user_id );

trunk/bp-core.php

-                      r2059
+                      r2077
 define( 'BP_CORE_DB_VERSION', '1800' );
 /***
  * Define the path and url of the BuddyPress plugins directory.
  * It is important to use plugins_url() core function to obtain
  * the correct scheme used (http or https).
+/***
+ * Define the path and url of the BuddyPress plugins directory.
+ * It is important to use plugins_url() core function to obtain
+ * the correct scheme used (http or https).
  */
 define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
 …
 if ( !defined( 'BP_HOME_BLOG_SLUG' ) )
     define( 'BP_HOME_BLOG_SLUG', 'blog' );
+/* Register BuddyPress themes contained within the theme folder */
+if ( function_exists( 'register_theme_folder' ) )
+    register_theme_folder( 'buddypress/bp-themes' );
 /* Register BuddyPress themes contained within the theme folder */
 if ( function_exists( 'register_theme_folder' ) )
 …
     global $displayed_user_id;
     global $action_variables;
     $current_user = wp_get_current_user();
     /* The domain for the root of the site where the main blog resides */
+    /* The domain for the root of the site where the main blog resides */
     $bp->root_domain = bp_core_get_root_domain();
     /* The user ID of the user who is currently logged in. */
     $bp->loggedin_user->id = $current_user->ID;
 …
     /* The domain for the user currently logged in. eg: http://domain.com/members/andy */
     $bp->loggedin_user->domain = bp_core_get_user_domain($current_user->ID);
     /* The user id of the user currently being viewed, set in /bp-core/bp-core-catchuri.php */
     $bp->displayed_user->id = $displayed_user_id;
     /* The domain for the user currently being displayed */
     $bp->displayed_user->domain = bp_core_get_user_domain($displayed_user_id);
     /* The component being used eg: http://domain.com/members/andy/ [profile] */
     $bp->current_component = $current_component; // type: string
     /* The current action for the component eg: http://domain.com/members/andy/profile/ [edit] */
     $bp->current_action = $current_action; // type: string
     /* The action variables for the current action eg: http://domain.com/members/andy/profile/edit/ [group] / [6] */
     $bp->action_variables = $action_variables; // type: array
     /* Only used where a component has a sub item, e.g. groups: http://domain.com/members/andy/groups/ [my-group] / home - manipulated in the actual component not in catch uri code.*/
     $bp->current_item = ''; // type: string
 …
     /* Sets up the array container for the component navigation rendered by bp_get_nav() */
     $bp->bp_nav = array();
     /* Sets up the array container for the component options navigation rendered by bp_get_options_nav() */
     $bp->bp_options_nav = array();
     /* Sets up container used for the title of the current component option and rendered by bp_get_options_title() */
     $bp->bp_options_title = '';
     /* Sets up container used for the avatar of the current component being viewed. Rendered by bp_get_options_avatar() */
     $bp->bp_options_avatar = '';
     /* Contains an array of all the active components. The key is the slug, value the internal ID of the component */
     $bp->active_components = array();
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
     $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', get_site_option( 'user-avatar-default' ) );
     $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', 'identicon' );
     $bp->grav_default->blog = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
     /* Fetch the full name for the logged in and current user */
     $bp->loggedin_user->fullname = bp_core_get_user_displayname( $bp->loggedin_user->id );
 …
        'is_item_admin' would be 1 if they are a group admin, 0 if they are not. */
     $bp->is_item_admin = bp_is_home();
     /* Used to determine if the logged in user is a moderator for the current content. */
     $bp->is_item_mod = false;
 …
     if ( !$bp->current_component )
         $bp->current_component = $bp->default_component;
     do_action( 'bp_core_setup_globals' );
+}
 …
+ *
  * For example: http://example.org/search or http://example.org/members
+ *
+ *
  * @package BuddyPress Core
  * @uses bp_core_add_root_component() Adds a slug to the root components global variable.
 …
+ *
  * Installs the core DB tables for BuddyPress.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_install() {
     global $wpdb, $bp;
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     $sql[] = "CREATE TABLE {$bp->core->table_name_notifications} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta( $sql );
     /* Add names of root components to the banned blog list to avoid conflicts */
     bp_core_add_illegal_names();
     update_site_option( 'bp-core-db-version', BP_CORE_DB_VERSION );
+}
 …
+ *
  * Checks to make sure the database tables are set up for the core component.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
     if ( !is_site_admin() )
         return false;
     require ( BP_PLUGIN_DIR . '/bp-core/bp-core-admin.php' );
 …
+ *
  * Adds the "BuddyPress" admin submenu item to the Site Admin tab.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
  */
 function bp_core_add_admin_menu() {
-    global $wpdb, $bp, $menu;
     if ( !is_site_admin() )
         return false;
     /* Add the administration tab under the "Site Admin" tab for site administrators */
     bp_core_add_admin_menu_page( array(
 …
         'position' => 2
     ) );
     add_submenu_page( 'bp-general-settings', __( 'General Settings', 'buddypress'), __( 'General Settings', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_settings' );
     add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
 …
  * Checks to see if a component's URL should be in the root, not under a member page:
  * eg: http://domain.com/groups/the-group NOT http://domain.com/members/andy/groups/the-group
+ *
+ *
  * @package BuddyPress Core
  * @return true if root component, else false.
 …
+ *
  * Sets up the profile navigation item if the Xprofile component is not installed.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_setup_nav() {
     global $bp;
     /***
+    /***
      * If the extended profiles component is disabled, we need to revert to using the
      * built in WordPress profile information
 …
         /* Add 'Profile' to the main navigation */
         bp_core_new_nav_item( array(
+        bp_core_new_nav_item( array(
             'name' => __('Profile', 'buddypress'),
             'slug' => $bp->core->profile->slug,
 …
         $profile_link = $bp->loggedin_user->domain . '/profile/';
         /* Add the subnav items to the profile */
         bp_core_new_subnav_item( array(
 …
             'screen_function' => 'bp_core_catch_profile_uri'
         ) );
         if ( 'profile' == $bp->current_component ) {
 …
             } else {
                 $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
                 $bp->bp_options_title = $bp->displayed_user->fullname;
+                $bp->bp_options_title = $bp->displayed_user->fullname;
+            }
+        }
+    }
+    }
+}
 add_action( 'plugins_loaded', 'bp_core_setup_nav' );
 …
  * Listens to the $bp component and action variables to determine if the user is viewing the members
  * directory page. If they are, it will set up the directory and load the members directory template.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
  * this action will fire and mark or unmark the user and their blogs as spam.
  * Must be a site admin for this function to run.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_action_set_spammer_status() {
     global $bp;
     if ( !is_site_admin() || bp_is_home() || !$bp->displayed_user->id )
         return false;
     if ( 'admin' == $bp->current_component && ( 'mark-spammer' == $bp->current_action || 'unmark-spammer' == $bp->current_action ) ) {
         /* Check the nonce */
 …
         /* Get the functions file */
         require( ABSPATH . 'wp-admin/includes/mu.php' );
         if ( 'mark-spammer' == $bp->current_action )
             $is_spam = 1;
 …
         /* Get the blogs for the user */
         $blogs = get_blogs_of_user( $bp->displayed_user->id, true );
         foreach ( (array) $blogs as $key => $details ) {
             /* Do not mark the main or current root blog as spam */
             if ( 1 == $details->userblog_id || BP_ROOT_BLOG == $details->userblog_id )
                 continue;
+            if ( 1 == $details->userblog_id || BP_ROOT_BLOG == $details->userblog_id )
+                continue;
             /* Update the blog status */
             update_blog_status( $details->userblog_id, 'spam', $is_spam );
             /* Fire the standard WPMU hook */
             do_action( 'make_spam_blog', $details->userblog_id );
+        }
         /* Finally, mark this user as a spammer */
         update_user_status( $bp->displayed_user->id, 'spam', $is_spam, 1 );
         if ( $is_spam )
             bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
         else
             bp_core_add_message( __( 'User removed as spammer.', 'buddypress' ) );
         do_action( 'bp_core_action_set_spammer_status' );
         bp_core_redirect( wp_get_referer() );
+    }
 …
+ *
  * Allows a site admin to delete a user from the adminbar menu.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_action_delete_user() {
     global $bp;
     if ( !is_site_admin() || bp_is_home() || !$bp->displayed_user->id )
         return false;
     if ( 'admin' == $bp->current_component && 'delete-user' == $bp->current_action ) {
         /* Check the nonce */
 …
         $errors = false;
         if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
             bp_core_add_message( sprintf( __( '%s has been deleted from the system.', 'buddypress' ), $bp->displayed_user->fullname ) );
 …
             $errors = true;
+        }
         do_action( 'bp_core_action_set_spammer_status', $errors );
         if ( $errors )
             bp_core_redirect( $bp->displayed_user->domain );
 …
  * Returns the domain for the passed user:
  * e.g. http://domain.com/members/andy/
+ *
+ *
  * @package BuddyPress Core
  * @global $current_user WordPress global variable containing current logged in user information
 …
 function bp_core_get_user_domain( $user_id ) {
     global $bp;
     if ( !$user_id ) return;
     $ud = get_userdata($user_id);
     if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
         $username = $ud->user_login;
     else
         $username = $ud->user_nicename;
     /* If we are using a members slug, include it. */
     if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) )
         return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . BP_MEMBERS_SLUG . '/' . $username . '/' );
     else
         return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . $username . '/' );
+        return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . $username . '/' );
+}
 …
  * Returns the domain for the root blog.
  * eg: http://domain.com/ OR https://domain.com
+ *
+ *
  * @package BuddyPress Core
  * @uses get_blog_option() WordPress function to fetch blog meta.
 …
 function bp_core_get_root_domain() {
     global $current_blog;
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
         $domain = get_blog_option( $current_blog->blog_id, 'siteurl' );
 …
  * Returns the user id for the user that is currently being displayed.
  * eg: http://andy.domain.com/ or http://domain.com/andy/
+ *
+ *
  * @package BuddyPress Core
  * @global $current_blog WordPress global containing information and settings for the current blog being viewed.
 …
+ *
  * Adds a navigation item to the main navigation array used in BuddyPress themes.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
     if ( empty($name) || empty($slug) )
         return false;
     /* If this is for site admins only and the user is not one, don't create the subnav item */
     if ( $site_admin_only && !is_site_admin() )
         return false;
     if ( empty( $item_css_id ) )
         $item_css_id = $slug;
 …
     if ( !$show_for_displayed_user && !bp_is_home() )
         return false;
     /***
      * If we are not viewing a user, and this is a root component, don't attach the
 …
+ *
  * Modify the default subnav item to load when a top level nav item is clicked.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_new_nav_default( $args = '' ) {
     global $bp;
     $defaults = array(
         'parent_slug' => false, // Slug of the parent
 …
  * We can only sort nav items by their position integer at a later point in time, once all
  * plugins have registered their navigation items.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_sort_nav_items() {
     global $bp;
     if ( empty( $bp->bp_nav ) || !is_array( $bp->bp_nav ) )
         return false;
     foreach ( $bp->bp_nav as $slug => $nav_item ) {
         if ( empty( $temp[$nav_item['position']]) )
 …
                 $nav_item['position']++;
             } while ( !empty( $temp[$nav_item['position']] ) );
             $temp[$nav_item['position']] = $nav_item;
+        }
+    }
     ksort( $temp );
     $bp->bp_nav = &$temp;
+    $bp->bp_nav = &$temp;
+}
 add_action( 'wp_head', 'bp_core_sort_nav_items' );
 …
+ *
  * Removes a navigation item from the main navigation array.
+ *
+ *
  * @package BuddyPress Core
  * @param $slug The slug of the sub navigation item.
 …
+ *
  * Adds a navigation item to the sub navigation array used in BuddyPress themes.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
         'screen_function' => false // The name of the function to run when clicked
     );
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
 …
     if ( empty($name) || empty($slug) || empty($parent_slug) || empty($parent_url) || empty($screen_function) )
         return false;
     /* If this is for site admins only and the user is not one, don't create the subnav item */
     if ( $site_admin_only && !is_site_admin() )
         return false;
     if ( empty( $item_css_id ) )
         $item_css_id = $slug;
     $bp->bp_options_nav[$parent_slug][$slug] = array(
         'name' => $name,
 …
         'user_has_access' => $user_has_access
     );
     if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
         if ( !is_object( $screen_function[0] ) )
 …
     if ( empty( $bp->bp_options_nav ) || !is_array( $bp->bp_options_nav ) )
         return false;
     foreach ( $bp->bp_options_nav as $parent_slug => $subnav_items ) {
         if ( !is_array( $subnav_items ) )
             continue;
         foreach ( $subnav_items as $subnav_item ) {
             if ( empty( $temp[$subnav_item['position']]) )
 …
                     $subnav_item['position']++;
                 } while ( !empty( $temp[$subnav_item['position']] ) );
                 $temp[$subnav_item['position']] = $subnav_item;
+            }
 …
+ *
  * Removes a navigation item from the sub navigation array used in BuddyPress themes.
+ *
+ *
  * @package BuddyPress Core
  * @param $parent_id The id of the parent navigation item.
 …
 function bp_core_remove_subnav_item( $parent_id, $slug ) {
     global $bp;
     unset( $bp->bp_options_nav[$parent_id][$slug] );
+}
 …
+ *
  * Clear the subnav items for a specific nav item.
+ *
+ *
  * @package BuddyPress Core
  * @param $parent_id The id of the parent navigation item.
 …
  * Loads:
  *   wp-content/member-themes/[activated_theme]/profile/edit-profile.php
+ *
+ *
  * @package BuddyPress Core
  * @param $username str Username to check.
 …
  *           http://community.domain.com/members/andy/friends
  *           http://domain.com/wpmu/members/andy/friends
+ *
+ *
  * @package BuddyPress Core
  * @param $slug str The slug of the component
 …
+ *
  * Returns the user_id for a user based on their username.
+ *
+ *
  * @package BuddyPress Core
  * @param $username str Username to check.
 …
 function bp_core_get_random_member() {
     global $bp, $wpdb;
     if ( isset( $_GET['random-member'] ) ) {
         $user = BP_Core_User::get_random_users(1);
         $ud = get_userdata( $user['users'][0]->user_id );
         bp_core_redirect( bp_core_get_user_domain( $user['users'][0]->user_id ) );
+        bp_core_redirect( bp_core_get_user_domain( $user['users'][0]->user_id ) );
+    }
+}
 …
+ *
  * Returns the user_id for a user based on their username.
+ *
+ *
  * @package BuddyPress Core
  * @param $username str Username to check.
 …
 function bp_core_get_userid( $username ) {
     global $wpdb;
     if ( !empty( $username ) )
         return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
+        return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
+}
 …
+ *
  * Returns the username for a user based on their user id.
+ *
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
 …
 function bp_core_get_username( $uid ) {
     global $userdata;
     if ( $uid == $userdata->ID )
         $username =  __( 'You', 'buddypress' );
     if ( !$ud = get_userdata($uid) )
         return false;
     $username = $ud->user_login;
+    $username = $ud->user_login;
     return apply_filters( 'bp_core_get_username', $username );
 …
+ *
  * Returns the URL with no HTML markup for a user based on their user id.
+ *
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
 …
 function bp_core_get_userurl( $uid ) {
     global $bp;
     if ( !is_numeric($uid) )
         return false;
 …
+ *
  * Returns the email address for the user based on user ID
+ *
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
 …
  * eg: <a href="http://andy.domain.com/">Andy Peatling</a>
  * Optional parameters will return just the name, or just the URL, or disable "You" text when
  * user matches the logged in user.
+ * user matches the logged in user.
+ *
  * [NOTES: This function needs to be cleaned up or split into separate functions]
+ *
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
 …
 function bp_core_get_userlink( $user_id, $no_anchor = false, $just_link = false, $deprecated = false, $with_s = false ) {
     global $userdata;
     $ud = get_userdata($user_id);
     if ( !$ud )
         return false;
     if ( function_exists('bp_fetch_user_fullname') ) {
+    if ( function_exists('bp_fetch_user_fullname') ) {
         $display_name = bp_core_get_user_displayname( $user_id );
         if ( $with_s )
             $display_name = sprintf( __( "%s's", 'buddypress' ), $display_name );
     } else {
         $display_name = $ud->display_name;
+    }
     if ( $no_anchor )
         return $display_name;
 …
     if ( !$url = bp_core_get_userurl($user_id) )
         return false;
     if ( $just_link )
         return $url;
     return '<a href="' . $url . '">' . $display_name . '</a>';
+    return '<a href="' . $url . '">' . $display_name . '</a>';
+}
 …
  * Fetch the display name for a user. This will use the "Name" field in xprofile if it is installed.
  * Otherwise, it will fall back to the normal WP display_name, or user_nicename, depending on what has been set.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_get_user_displayname( $user_id ) {
     global $bp;
     if ( !$user_id )
         return false;
     if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
         if ( function_exists('xprofile_install') ) {
 …
         } else {
             $ud = get_userdata($user_id);
             if ( !empty( $ud->display_name ) )
                 $fullname = $ud->display_name;
 …
                 $fullname = $ud->user_nicename;
+        }
         wp_cache_set( 'bp_user_fullname_' . $user_id, $fullname, 'bp' );
+    }
     return apply_filters( 'bp_core_get_user_displayname', $fullname );
+}
 …
+ *
  * Returns the user link for the user based on user email address
+ *
+ *
  * @package BuddyPress Core
  * @param $email str The email address for the user.
 …
+ *
  * Returns the user link for the user based on user's username
+ *
+ *
  * @package BuddyPress Core
  * @param $username str The username for the user.
 …
 function bp_core_get_userlink_by_username( $username ) {
     global $wpdb;
     $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) );
+    $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) );
     return apply_filters( 'bp_core_get_userlink_by_username', bp_core_get_userlink( $user_id, false, false, true ) );
+}
 …
 function bp_core_is_user_spammer( $user_id ) {
     global $wpdb;
     return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
+    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
+}
 …
 function bp_core_is_user_deleted( $user_id ) {
     global $wpdb;
     return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
+    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
+}
 …
     if ( !$time )
         return false;
     $date = date( "F j, Y ", $time );
     if ( !$just_date ) {
         $date .= __('at', 'buddypress') . date( ' g:iA', $time );
+    }
     return $date;
+}
 …
+ *
  * Adds a feedback (error/success) message to the WP cookie so it can be displayed after the page reloads.
+ *
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_message( $message, $type = false ) {
     global $bp;
     if ( !$type )
         $type = 'success';
     /* Send the values to the cookie for page reload display */
     @setcookie( 'bp-message', $message, time()+60*60*24, COOKIEPATH );
     @setcookie( 'bp-message-type', $type, time()+60*60*24, COOKIEPATH );
     /***
      * Send the values to the $bp global so we can still output messages
 …
  * After the message is displayed, it removes the message vars from the cookie so that the message
  * is not shown to the user multiple times.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp_message The message text
 …
     if ( empty( $bp->template_message ) )
         $bp->template_message = $_COOKIE['bp-message'];
     if ( empty( $bp->template_message_type ) )
         $bp->template_message_type = $_COOKIE['bp-message-type'];
     add_action( 'template_notices', 'bp_core_render_message' );
     @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
     @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
 …
  * Renders a feedback message (either error or success message) to the theme template.
  * The hook action 'template_notices' is used to call this function, it is not called directly.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_render_message() {
     global $bp;
     if ( $bp->template_message ) {
         $type = ( 'success' == $bp->template_message_type ) ? 'updated' : 'error';
 …
     <?php
         do_action( 'bp_core_render_message' );
+    }
+    }
+}
 …
+ *
  * Based on function created by Dunstan Orchard - http://1976design.com
+ *
+ *
  * This function will return an English representation of the time elapsed
  * since a given date.
 …
  * eg: 4 days
  * eg: 4 weeks and 6 days
+ *
+ *
  * @package BuddyPress Core
  * @param $older_date int Unix timestamp of date you want to calculate the time since for
 …
     array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
     );
     $older_date = strtotime( gmdate( 'Y-m-d H:i:s', $older_date ) );
 …
     /* $newer_date will have a value if we want to work out time elapsed between two known dates */
     $newer_date = ( !$newer_date ) ? ( strtotime( gmdate( 'Y-m-d H:i:s' ) ) + ( 60*60*0 ) ) : $newer_date;
     /* Difference in seconds */
     $since = $newer_date - $older_date;
     if ( 0 > $since )
         return __( '[Use GMT Timezone]', 'buddypress' );
 …
         $seconds2 = $chunks[$i + 1][0];
         $name2 = $chunks[$i + 1][1];
         //if ( $chunks[$i + 1][1] == __( 'second', 'buddypress' ) ) return $output;
         if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
             /* Add to output var */
 …
  * show the length of time since the user was last active.
  * This function will update that time as a usermeta setting for the user every 5 minutes.
+ *
+ *
  * @package BuddyPress Core
  * @global $userdata WordPress user data for the current logged in user.
 …
 function bp_core_record_activity() {
     global $bp;
     if ( !is_user_logged_in() )
         return false;
     $activity = get_usermeta( $bp->loggedin_user->id, 'last_activity' );
     if ( '' == $activity || time() >= strtotime( '+5 minutes', $activity ) )
         update_usermeta( $bp->loggedin_user->id, 'last_activity', time() );
 …
+ *
  * Formats last activity based on time since date given.
+ *
+ *
  * @package BuddyPress Core
  * @param last_activity_date The date of last activity.
 …
     } else {
         if ( strstr( $last_activity_date, '-' ) ) {
             $last_active = bp_core_time_since( strtotime( $last_activity_date ) );
+            $last_active = bp_core_time_since( strtotime( $last_activity_date ) );
         } else {
             $last_active = bp_core_time_since( $last_activity_date );
+            $last_active = bp_core_time_since( $last_activity_date );
+        }
         $last_active = sprintf( $string, $last_active );
+    }
     return $last_active;
+}
 …
+ *
  * Fetch every post that is authored by the given user for the current blog.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_get_all_posts_for_user( $user_id = null ) {
     global $bp, $wpdb;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM $wpdb->posts WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) );
+}
 …
+ *
  * Get the path of of the current site.
+ *
+ *
  * @package BuddyPress Core
  * @global $comment WordPress comment global for the current comment.
 …
 function bp_core_get_site_path() {
     global $current_site;
     return $current_site->path;
+}
 …
+ *
  * Performs a status safe wp_redirect() that is compatible with bp_catch_uri()
+ *
+ *
  * @package BuddyPress Core
  * @global $bp_no_status_set Makes sure that there are no conflicts with status_header() called in bp_core_do_catch_uri()
 …
 function bp_core_redirect( $location, $status = 302 ) {
     global $bp_no_status_set;
     // Make sure we don't call status_header() in bp_core_do_catch_uri()
+    // Make sure we don't call status_header() in bp_core_do_catch_uri()
     // as this conflicts with wp_redirect()
     $bp_no_status_set = true;
     wp_redirect( $location, $status );
     die;
 …
+ *
  * Returns the referrer URL without the http(s)://
+ *
+ *
  * @package BuddyPress Core
  * @return The referrer URL
 …
+ *
  * For example, it would stop someone creating a blog with the slug "groups".
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function bp_core_add_illegal_names() {
     global $bp;
     $current = maybe_unserialize( get_site_option( 'illegal_names' ) );
     $bp_illegal_names = $bp->root_components;
     if ( is_array( $current ) ) {
         foreach( $bp_illegal_names as $bp_illegal_name ) {
 …
+ *
  * Sets the "From" name in emails sent to the name of the site and not "WordPress"
+ *
+ *
  * @package BuddyPress Core
  * @uses get_blog_option() fetches the value for a meta_key in the wp_X_options table
 …
+ *
  * Sets the "From" address in emails sent
+ *
+ *
  * @package BuddyPress Core
  * @global $current_site Object containing current site metadata
 …
+ *
  * Allows a user to completely remove their account from the system
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
+ *
  * A javascript free implementation of the search functions in BuddyPress
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
         $search_terms = $_POST['search-terms'];
         $search_which = $_POST['search-which'];
         if ( !$slug || empty( $slug ) ) {
             switch ( $search_which ) {
 …
+            }
+        }
         $search_url = apply_filters( 'bp_core_search_site', site_url( $slug . $var . urlencode($search_terms) ), $search_terms );
         bp_core_redirect( $search_url );
+    }
 …
 /**
  * bp_core_ucfirst()
+ *
+ *
  * Localization safe ucfirst() support.
+ *
+ *
  * @package BuddyPress Core
  */
 …
     if ( function_exists( 'mb_strtoupper' ) && function_exists( 'mb_substr' ) ) {
         $fc = mb_strtoupper( mb_substr( $str, 0, 1 ) );
         return $fc.mb_substr( $str, 1 );
+        return $fc.mb_substr( $str, 1 );
     } else {
         return ucfirst( $str );
 …
 /**
  * bp_core_strip_username_spaces()
+ *
+ *
  * Strips spaces from usernames that are created using add_user() and wp_insert_user()
+ *
+ *
  * @package BuddyPress Core
  */
 …
 /**
  * bp_core_clear_cache()
  * REQUIRES WP-SUPER-CACHE
+ *
+ * REQUIRES WP-SUPER-CACHE
+ *
  * When wp-super-cache is installed this function will clear cached pages
  * so that success/error messages are not cached, or time sensitive content.
+ *
+ *
  * @package BuddyPress Core
  */
 function bp_core_clear_cache() {
     global $cache_path, $cache_filename;
     if ( function_exists( 'prune_super_cache' ) ) {
         do_action( 'bp_core_clear_cache' );
         return prune_super_cache( $cache_path, true );
+        return prune_super_cache( $cache_path, true );
+    }
+}
 …
 /**
  * bp_core_print_generation_time()
+ *
+ *
  * Prints the generation time in the footer of the site.
+ *
+ *
  * @package BuddyPress Core
  */
 …
 /**
  * bp_core_add_admin_menu_page()
+ *
+ *
  * A better version of add_admin_menu_page() that allows positioning of menus.
+ *
+ *
  * @package BuddyPress Core
  */
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     $file = plugin_basename( $file );
 …
         $position++;
     } while ( !empty( $menu[$position] ) );
     $menu[$position] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
 …
  * When a user logs in, check if they have been marked as a spammer. If then simply
  * redirect them to the home page and stop them from logging in.
+ *
+ *
  * @package BuddyPress Core
  * @param $username The username of the user
 …
 function bp_core_boot_spammer( $auth_obj, $username ) {
     global $bp;
     $user = get_userdatabylogin( $username );
 …
+ *
  * Deletes usermeta for the user when the user is deleted.
+ *
+ *
  * @package BuddyPress Core
  * @param $user_id The user id for the user to delete usermeta for
 …
 /**
  * bp_load_buddypress_textdomain()
+ *
+ *
  * Load the buddypress translation file for current language
+ *
+ *
  * @package BuddyPress Core
  */
 …
     $locale = apply_filters( 'buddypress_locale', get_locale() );
     $mofile = BP_PLUGIN_DIR . "/bp-languages/buddypress-$locale.mo";
     if ( file_exists( $mofile ) )
         load_textdomain( 'buddypress', $mofile );
 …
 /**
  * bp_core_update_message()
+ *
+ *
  * Add an extra update message to the update plugin notification.
+ *
+ *
  * @package BuddyPress Core
  */
 …
 /**
  * bp_core_clear_user_object_cache()
+ *
+ *
  * Clears all cached objects for a user, or a user is part of.
+ *
+ *
  * @package BuddyPress Core
  */

trunk/bp-core/bp-core-activation.php

-                      r2025
+                      r2077
 function bp_core_screen_activation() {
     global $bp, $wpdb;
     if ( BP_ACTIVATION_SLUG != $bp->current_component )
         return false;
     /* If we are using a BuddyPress 1.0 theme ignore this. */
     if ( file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     /* Check if an activation key has been passed */
     if ( isset( $_GET['key'] ) ) {
         require_once( ABSPATH . WPINC . '/registration.php' );
         /* Activate the signup */
         $signup = apply_filters( 'bp_core_activate_account', wpmu_activate_signup( $_GET['key'] ) );
         /* If there was errors, add a message and redirect */
         if ( $signup->errors ) {
 …
             bp_core_redirect( $bp->root_domain . '/' . BP_ACTIVATION_SLUG );
+        }
         /* Set the password */
         if ( !empty( $signup['meta']['password'] ) )
             $wpdb->update( $wpdb->users, array( 'user_pass' => $signup['meta']['password'] ), array( 'ID' => $signup['user_id'] ), array( '%s' ), array( '%d' ) );
         /* Set any profile data */
+        /* Set any profile data */
         if ( function_exists( 'xprofile_set_field_data' ) ) {
             if ( !empty( $signup['meta']['profile_field_ids'] ) ) {
                 $profile_field_ids = explode( ',', $signup['meta']['profile_field_ids'] );
                 foreach( $profile_field_ids as $field_id ) {
                     $current_field = $signup['meta']["field_{$field_id}"];
                     if ( !empty( $current_field ) )
                         xprofile_set_field_data( $field_id, $signup['user_id'], $current_field );
+                }
+            }
+        }
         /* Check for an uploaded avatar and move that to the correct user folder */
         $hashed_key = wp_hash( $_GET['key'] );
         /* Check if the avatar folder exists. If it does, move rename it, move it and delete the signup avatar dir */
         if ( file_exists( WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/signups/' . $hashed_key ) ) {
             @rename( WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/signups/' . $hashed_key, WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/' . $signup['user_id'] );
+        }
         /* Record the new user in the activity streams */
         if ( function_exists( 'bp_activity_add' ) ) {
             $userlink = bp_core_get_userlink( $signup['user_id'] );
             bp_activity_add( array(
                 'user_id' => $signup['user_id'],
 …
                 'primary_link' => apply_filters( 'bp_core_actiivty_registered_member_primary_link', $userlink ),
                 'component_name' => 'profile',
                 'component_action' => 'new_member'
+                'component_action' => 'new_member'
             ) );
+        }
 …
         do_action( 'bp_core_account_activated', &$signup, $_GET['key'] );
         bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
         $bp->activation_complete = true;
+    }
     if ( '' != locate_template( array( 'registration/activate' ), false ) )
         bp_core_load_template( apply_filters( 'bp_core_template_activate', 'activate' ) );
+        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'activate' ) );
     else
         bp_core_load_template( apply_filters( 'bp_core_template_activate', 'registration/activate' ) );
+        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'registration/activate' ) );
+}
 add_action( 'wp', 'bp_core_screen_activation', 3 );
 …
     if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
         return true;
     return false;
+}

trunk/bp-core/bp-core-admin.php

-                      r2029
+                      r2077
     global $wpdb, $bp, $current_blog;
 ?>
     <?php
     if ( isset( $_POST['bp-admin-submit'] ) && isset( $_POST['bp-admin'] ) ) {
         if ( !check_admin_referer('bp-admin') )
             return false;
         // Settings form submitted, now save the settings.
         foreach ( $_POST['bp-admin'] as $key => $value ) {
             if ( function_exists( 'xprofile_install' ) ) {
                 if ( 'bp-xprofile-base-group-name' == $key ) {
                     $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s WHERE name = %s AND id = 1", $value, stripslashes( get_site_option('bp-xprofile-base-group-name') ) ) );
+                }
                 if ( 'bp-xprofile-fullname-field-name' == $key ) {
                     $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET name = %s WHERE name = %s AND group_id = 1", $value, stripslashes( get_site_option('bp-xprofile-fullname-field-name') ) ) );
+                }
+            }
             update_site_option( $key, $value );
+        }
+    }
     ?>
     <div class="wrap">
         <h2><?php _e( 'BuddyPress Settings', 'buddypress' ) ?></h2>
 …
         <form action="" method="post" id="bp-admin-form">
             <table class="form-table">
             <tbody>
 …
                     <td>
                         <input name="bp-admin[bp-xprofile-base-group-name]" id="bp-xprofile-base-group-name" value="<?php echo get_site_option('bp-xprofile-base-group-name') ?>" />
                     </td>
+                    </td>
                 </tr>
                 <tr>
 …
                         <input type="radio" name="bp-admin[bp-disable-profile-sync]"<?php if ( (int)get_site_option( 'bp-disable-profile-sync' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-profile-sync" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
                         <input type="radio" name="bp-admin[bp-disable-profile-sync]"<?php if ( !(int)get_site_option( 'bp-disable-profile-sync' ) || '' == get_site_option( 'bp-disable-profile-sync' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-profile-sync" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
                         <input type="radio" name="bp-admin[hide-loggedout-adminbar]"<?php if ( (int)get_site_option( 'hide-loggedout-adminbar' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-hide-loggedout-adminbar-yes" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
                         <input type="radio" name="bp-admin[hide-loggedout-adminbar]"<?php if ( !(int)get_site_option( 'hide-loggedout-adminbar' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-hide-loggedout-adminbar-no" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <tr>
 …
                         <input type="radio" name="bp-admin[non-friend-wire-posting]"<?php if ( (int)get_site_option( 'non-friend-wire-posting' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-non-friend-wire-post" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
                         <input type="radio" name="bp-admin[non-friend-wire-posting]"<?php if ( !(int)get_site_option( 'non-friend-wire-posting' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-non-friend-wire-post" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
                     </td>
                 </tr>
                 <?php } ?>
+                    </td>
+                </tr>
+                <?php } ?>
                 <tr>
                     <th scope="row"><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</th>
 …
                         <input type="radio" name="bp-admin[bp-disable-account-deletion]"<?php if ( (int)get_site_option( 'bp-disable-account-deletion' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-account-deletion" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
                         <input type="radio" name="bp-admin[bp-disable-account-deletion]"<?php if ( !(int)get_site_option( 'bp-disable-account-deletion' ) || '' == get_site_option( 'bp-disable-account-deletion' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-account-deletion" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php if ( function_exists( 'bp_forums_setup') ) : ?>
 …
                         <input type="radio" name="bp-admin[bp-disable-forum-directory]"<?php if ( (int)get_site_option( 'bp-disable-forum-directory' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-forum-directory" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
                         <input type="radio" name="bp-admin[bp-disable-forum-directory]"<?php if ( !(int)get_site_option( 'bp-disable-forum-directory' ) || '' == get_site_option( 'bp-disable-forum-directory' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-forum-directory" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
                     </td>
                 </tr>
                 <?php endif; ?>
+                    </td>
+                </tr>
+                <?php endif; ?>
                 <?php $themes = bp_core_get_buddypress_themes() ?>
                 <?php if ( $themes ) : ?>
 …
                         <td>
                                 <select name="bp-admin[active-member-theme]" id="active-member-theme">
                                 <?php
                                 for ( $i = 0; $i < count($themes); $i++ ) {
+                                <?php
+                                for ( $i = 0; $i < count($themes); $i++ ) {
                                     if ( $themes[$i]['template'] == get_site_option( 'active-member-theme' ) ) {
                                         $selected = ' selected="selected"';
 …
                                 <?php } ?>
                             </select>
                         </td>
+                        </td>
                     </tr>
                 <?php else : ?>
 …
                     <?php endif; ?>
                 <?php endif; ?>
                 <tr>
                     <th scope="row"><?php _e( 'Default User Avatar', 'buddypress' ) ?></th>
 …
             <?php do_action( 'bp_core_admin_screen' ) ?>
             <p class="submit">
                 <input class="button-primary" type="submit" name="bp-admin-submit" id="bp-admin-submit" value="<?php _e( 'Save Settings', 'buddypress' ) ?>"/>
 …
             <?php wp_nonce_field( 'bp-admin' ) ?>
         </form>
     </div>
 <?php
+<?php
+}
 …
     global $wpdb, $bp;
 ?>
     <?php
     if ( isset( $_POST['bp-admin-component-submit'] ) && isset( $_POST['bp_components'] ) ) {
         if ( !check_admin_referer('bp-admin-component-setup') )
             return false;
         // Settings form submitted, now save the settings.
         foreach ( $_POST['bp_components'] as $key => $value ) {
             if ( !(int) $value )
                 $disabled[$key] = 1;
+                $disabled[$key] = 1;
+        }
         update_site_option( 'bp-deactivated-components', $disabled );
+    }
     ?>
     <div class="wrap">
         <h2><?php _e( 'BuddyPress Component Setup', 'buddypress' ) ?></h2>
         <?php if ( isset( $_POST['bp-admin-component-submit'] ) ) : ?>
             <div id="message" class="updated fade">
 …
             </div>
         <?php endif; ?>
         <form action="" method="post" id="bp-admin-component-form">
             <p>
             <?php _e(
                 'By default, all BuddyPress components are enabled. You can selectively disable any of the
+            <?php _e(
+                'By default, all BuddyPress components are enabled. You can selectively disable any of the
                 components by using the form below. Your BuddyPress installation will continue to function, however
                 the features of the disabled components will no longer be accessible to
 …
                 ', 'buddypress' )?>
             </p>
             <?php $disabled_components = get_site_option( 'bp-deactivated-components' ); ?>
             <table class="form-table" style="width: 80%">
             <tbody>
 …
                         <input type="radio" name="bp_components[bp-activity.php]" value="1"<?php if ( !isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
                         <input type="radio" name="bp_components[bp-activity.php]" value="0"<?php if ( isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
                         <input type="radio" name="bp_components[bp-blogs.php]" value="1"<?php if ( !isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
                         <input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
                         <input type="radio" name="bp_components[bp-forums.php]" value="1"<?php if ( !isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
                         <input type="radio" name="bp_components[bp-forums.php]" value="0"<?php if ( isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
                         <input type="radio" name="bp_components[bp-friends.php]" value="1"<?php if ( !isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
                         <input type="radio" name="bp_components[bp-friends.php]" value="0"<?php if ( isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
                         <input type="radio" name="bp_components[bp-groups.php]" value="1"<?php if ( !isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
                         <input type="radio" name="bp_components[bp-groups.php]" value="0"<?php if ( isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
                         <input type="radio" name="bp_components[bp-messages.php]" value="1"<?php if ( !isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
                         <input type="radio" name="bp_components[bp-messages.php]" value="0"<?php if ( isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
                         <input type="radio" name="bp_components[bp-wire.php]" value="1"<?php if ( !isset( $disabled_components['bp-wire.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
                         <input type="radio" name="bp_components[bp-wire.php]" value="0"<?php if ( isset( $disabled_components['bp-wire.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
+                    </td>
                 </tr>
                 <?php endif; ?>
 …
             </tbody>
             </table>
             <p class="submit">
                 <input class="button-primary" type="submit" name="bp-admin-component-submit" id="bp-admin-component-submit" value="<?php _e( 'Save Settings', 'buddypress' ) ?>"/>
             </p>
             <?php wp_nonce_field( 'bp-admin-component-setup' ) ?>
         </form>
     </div>
 <?php
+<?php
+}

trunk/bp-core/bp-core-adminbar.php

-                      r1905
+                      r2077
 function bp_core_admin_bar() {
     global $bp, $wpdb, $current_blog, $doing_admin_bar;
     if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
         return false;
     $doing_admin_bar = true;
     if ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
         return false;
 …
     echo '<ul class="main-nav">';
     // **** Do bp-adminbar-menus Actions ********
     do_action( 'bp_adminbar_menus' );
 …
 function bp_adminbar_logo() {
     global $bp;
     echo '<a href="' . $bp->root_domain . '" id="admin-bar-logo">' . get_blog_option( BP_ROOT_BLOG, 'blogname') . '</a>';
+}
 …
     global $bp;
     if ( !is_user_logged_in() ) {
+    if ( !is_user_logged_in() ) {
         echo '<li class="bp-login no-arrow"><a href="' . $bp->root_domain . '/wp-login.php?redirect_to=' . urlencode( $bp->root_domain ) . '">' . __( 'Log In', 'buddypress' ) . '</a></li>';
         // Show "Sign Up" link if user registrations are allowed
         if ( get_site_option( 'registration' ) != 'none' && get_site_option( 'registration' ) != 'blog' ) {
 …
     if ( is_user_logged_in() ) {
         echo '<li id="bp-adminbar-account-menu"><a href="' . bp_loggedin_user_domain() . '">';
         echo __( 'My Account', 'buddypress' ) . '</a>';
         echo '<ul>';
         /* Loop through each navigation item */
         $counter = 0;
         foreach( $bp->bp_nav as $nav_item ) {
             $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
             echo '<li' . $alt . '>';
             echo '<a id="bp-admin-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a>';
             if ( is_array( $bp->bp_options_nav[$nav_item['css_id']] ) ) {
                 echo '<ul>';
 …
                 foreach( $bp->bp_options_nav[$nav_item['css_id']] as $subnav_item ) {
                     $alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
                     echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';
+                    echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';
                     $sub_counter++;
+                }
                 echo '</ul>';
+            }
             echo '</li>';
             $counter++;
+        }
         $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
         if ( function_exists('wp_logout_url') ) {
             echo '<li' . $alt . '><a id="bp-admin-logout" href="' . wp_logout_url(site_url()) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
         } else {
             echo '<li' . $alt . '><a id="bp-admin-logout" href="' . site_url() . '/wp-login.php?action=logout&amp;redirect_to=' . site_url() . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+        }
+        if ( function_exists('wp_logout_url') ) {
+            echo '<li' . $alt . '><a id="bp-admin-logout" href="' . wp_logout_url(site_url()) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+        } else {
+            echo '<li' . $alt . '><a id="bp-admin-logout" href="' . site_url() . '/wp-login.php?action=logout&amp;redirect_to=' . site_url() . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+        }
         echo '</ul>';
         echo '</li>';
 …
 // return a string indicating user's role in that blog
 function get_blog_role_for_user( $user, $blog ) {
     // If the user is a site admin, just display admin.
     if ( is_site_admin() )
+    if ( is_site_admin() )
         return __( 'Admin', 'buddypress');
     $roles = get_usermeta( $user, 'wp_' . $blog . '_capabilities' );
     if ( isset( $roles['subscriber'] ) )
         $role = __( 'Subscriber', 'buddypress' );
+        $role = __( 'Subscriber', 'buddypress' );
     elseif  ( isset( $roles['contributor'] ) )
         $role = __( 'Contributor', 'buddypress' );
 …
     else
         return false;
     return $role;
+}
 …
 function bp_adminbar_blogs_menu() {
     if ( is_user_logged_in() ) {
         global $bp;
+        global $bp;
         if ( function_exists('bp_blogs_install') ) {
             if ( !$blogs = wp_cache_get( 'bp_blogs_of_user_' . $bp->loggedin_user->id, 'bp' ) ) {
                 $blogs = get_blogs_of_user( $bp->loggedin_user->id );
 …
             echo '<li id="bp-adminbar-blogs-menu"><a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/my-blogs">';
             _e( 'My Blogs', 'buddypress' );
             echo '</a>';
             echo '<ul>';
+            echo '<ul>';
             if ( is_array( $blogs )) {
                 $counter = 0;
                 foreach( $blogs as $blog ) {
 …
                         echo '<li><a href="' . $blog->siteurl  . '/wp-admin/post-new.php">' . __('New Post', 'buddypress') . '</a></li>';
                         echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/edit.php">' . __('Manage Posts', 'buddypress') . '</a></li>';
                         echo '<li><a href="' . $blog->siteurl  . '/wp-admin/edit-comments.php">' . __('Manage Comments', 'buddypress') . '</a></li>';
                         if ( 'Admin' == $role ) {
                             echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/themes.php">' . __('Switch Theme', 'buddypress') . '</a></li>';
+                        }
                         echo '</ul>';
+                        echo '<li><a href="' . $blog->siteurl  . '/wp-admin/edit-comments.php">' . __('Manage Comments', 'buddypress') . '</a></li>';
+                        if ( 'Admin' == $role ) {
+                            echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/themes.php">' . __('Switch Theme', 'buddypress') . '</a></li>';
+                        }
+                        echo '</ul>';
+                    }
                     echo '</li>';
 …
+                }
+            }
             $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
             if ( bp_blog_signup_enabled() ) {
                 echo '<li' . $alt . '>';
 …
                 echo '</li>';
+            }
             echo '</ul>';
             echo '</li>';
+        }
+    }
+}
+}
 // **** "Notifications" Menu *********
 function bp_adminbar_notifications_menu() {
+function bp_adminbar_notifications_menu() {
     if ( is_user_logged_in() ) {
         global $bp;
         echo '<li id="bp-adminbar-notifications-menu"><a href="' . $bp->loggedin_user->domain . '">';
         _e( 'Notifications', 'buddypress' );
         if ( $notifications = bp_core_get_notifications_for_user( $bp->loggedin_user->id ) ) { ?>
             <span><?php echo count($notifications) ?></span>
         <?php
+        }
         echo '</a>';
         echo '<ul>';
         if ( $notifications ) { ?>
             <?php $counter = 0; ?>
 …
         <?php
+        }
         echo '</ul>';
         echo '</li>';
 …
 function bp_adminbar_authors_menu() {
     global $current_blog;
     if ( $current_blog->blog_id > 1 ) {
         $authors = get_users_of_blog();
+        $authors = get_users_of_blog();
         if ( is_array( $authors ) ) {
             /* This is a blog, render a menu with links to all authors */
 …
             _e('Blog Authors', 'buddypress');
             echo '</a>';
             echo '<ul class="author-list">';
             foreach( $authors as $author ) {
 …
+    }
+}
 // **** "Random" Menu (visible when not logged in) ********
 function bp_adminbar_random_menu() {
+function bp_adminbar_random_menu() {
     global $bp; ?>
     <li class="align-right" id="bp-adminbar-visitrandom-menu">
 …
             <?php if ( function_exists('bp_blogs_install') ) : ?>
             <li><a href="<?php echo $bp->root_domain . '/' . $bp->blogs->slug . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
             <?php endif; ?>
             <?php do_action( 'bp_adminbar_random_menu' ) ?>
         </ul>

trunk/bp-core/bp-core-avatars.php

-                      r2069
+                      r2077
 if ( !defined( 'BP_AVATAR_DEFAULT_THUMB' ) )
     define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-xprofile/images/none-thumbnail.gif' );
 function bp_core_fetch_avatar( $args = '' ) {
     global $bp, $current_blog;
     $defaults = array(
         'item_id' => false,
 …
         'type' => 'thumb',
         'avatar_dir' => false,
         'width' => false,
+        'width' => false,
         'height' => false,
         'class' => 'avatar',
 …
     $params = wp_parse_args( $args, $defaults );
     extract( $params, EXTR_SKIP );
+    extract( $params, EXTR_SKIP );
     if ( !$item_id ) {
 …
         else if ( 'blog' == $object )
             $item_id = $current_blog->id;
         $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object );
         if ( !$item_id ) return false;
+    }
     if ( !$avatar_dir ) {
         if ( 'user' == $object )
 …
         else if ( 'blog' == $object )
             $avatar_dir = 'blog-avatars';
         $avatar_dir = apply_filters( 'bp_core_avatar_dir', $avatar_dir, $object );
         if ( !$avatar_dir ) return false;
+    }
+        if ( !$avatar_dir ) return false;
+    }
     if ( !$css_id )
         $css_id = $object . '-' . $item_id . '-avatar';
+        $css_id = $object . '-' . $item_id . '-avatar';
     if ( $width )
         $html_width = " width='{$width}'";
     else
         $html_width = ( 'thumb' == $type ) ? ' width="' . BP_AVATAR_THUMB_WIDTH . '"' : ' width="' . BP_AVATAR_FULL_WIDTH . '"';
     if ( $height )
         $html_height = " height='{$height}'";
     else
         $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"';
     $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
     $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+    $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+    $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
     /****
 …
+    }
     /* If no avatars have been uploaded for this item, display a gravatar */
+    /* If no avatars have been uploaded for this item, display a gravatar */
     if ( !file_exists( $avatar_url ) && !$no_grav ) {
         if ( empty( $bp->grav_default->{$object} ) )
             $default_grav = 'wavatar';
 …
         else if ( 'full' == $type ) $grav_size = BP_AVATAR_FULL_WIDTH;
         else if ( 'thumb' == $type ) $grav_size = BP_AVATAR_THUMB_WIDTH;
         if ( 'user' == $object ) {
             $ud = get_userdata( $item_id );
 …
             $grav_email = "{$item_id}-{$object}@{$bp->root_domain}";
+        }
         $grav_email = apply_filters( 'bp_core_gravatar_email', $grav_email, $item_id, $object );
+        $grav_email = apply_filters( 'bp_core_gravatar_email', $grav_email, $item_id, $object );
         $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $grav_email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
         return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
     } else if ( !file_exists( $avatar_url ) && $no_grav )
         return false;
+}
 function bp_core_delete_existing_avatar( $args = '' ) {
     global $bp;
     $defaults = array(
         'item_id' => false,
 …
     $args = wp_parse_args( $args, $defaults );
     extract( $args, EXTR_SKIP );
+    extract( $args, EXTR_SKIP );
     if ( !$item_id ) {
         if ( 'user' == $object )
 …
         else if ( 'blog' == $object )
             $item_id = $current_blog->id;
         $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object );
         if ( !$item_id ) return false;
+    }
     if ( !$avatar_dir ) {
         if ( 'user' == $object )
 …
         else if ( 'blog' == $object )
             $avatar_dir = 'blog-avatars';
         $avatar_dir = apply_filters( 'bp_core_avatar_dir', $avatar_dir, $object );
         if ( !$avatar_dir ) return false;
+        if ( !$avatar_dir ) return false;
+    }
 …
+    }
     $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+    $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
     if ( !file_exists( $avatar_folder_dir ) )
 …
         while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
             if ( ( preg_match( "/-bpfull/", $avatar_file ) || preg_match( "/-bpthumb/", $avatar_file ) ) && '.' != $avatar_file && '..' != $avatar_file )
                 @unlink( $avatar_folder_dir . '/' . $avatar_file );
+                @unlink( $avatar_folder_dir . '/' . $avatar_file );
+        }
+    }
 …
 function bp_core_avatar_handle_upload( $file, $upload_dir_filter ) {
     global $bp;
     require_once( ABSPATH . '/wp-admin/includes/image.php' );
     require_once( ABSPATH . '/wp-admin/includes/file.php' );
     $uploadErrors = array(
 => __("There is no error, the file uploaded with success", 'buddypress'),
 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
+=> __("There is no error, the file uploaded with success", 'buddypress'),
+=> __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
 => __("The uploaded file was only partially uploaded", 'buddypress'),
 …
         return false;
+    }
     if ( !bp_core_check_avatar_size( $file ) ) {
         bp_core_add_message( sprintf( __( 'The file you uploaded is too big. Please upload a file under %s', 'buddypress'), size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE) ), 'error' );
         return false;
+    }
     if ( !bp_core_check_avatar_type( $file ) ) {
         bp_core_add_message( __( 'Please upload only JPG, GIF or PNG photos.', 'buddypress' ), 'error' );
         return false;
+    }
     // Filter the upload location
     add_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
     $bp->avatar_admin->original = wp_handle_upload( $file['file'], array( 'action'=> 'bp_avatar_upload' ) );
 …
         return false;
+    }
     // Resize the image down to something manageable and then delete the original
     if ( getimagesize( $bp->avatar_admin->original['file'] ) > BP_AVATAR_ORIGINAL_MAX_WIDTH ) {
         $bp->avatar_admin->resized = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
+    }
     $bp->avatar_admin->image = new stdClass;
     // We only want to handle one image after resize.
+    // We only want to handle one image after resize.
     if ( empty( $bp->avatar_admin->resized ) )
         $bp->avatar_admin->image->dir = $bp->avatar_admin->original['file'];
 …
         @unlink( $bp->avatar_admin->original['file'] );
+    }
     /* Set the url value for the image */
     $bp->avatar_admin->image->url = str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $bp->avatar_admin->image->dir );
 …
 function bp_core_avatar_handle_crop( $args = '' ) {
     global $bp;
     $defaults = array(
         'object' => 'user',
 …
     if ( !file_exists( WP_CONTENT_DIR . '/' . $original_file ) )
         return false;
     if ( !$item_id )
         $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . dirname( $original_file ), $item_id, $object, $avatar_dir );
+        $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . dirname( $original_file ), $item_id, $object, $avatar_dir );
     else
         $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
 …
     if ( !file_exists( $avatar_folder_dir ) )
         return false;
     require_once( ABSPATH . '/wp-admin/includes/image.php' );
     require_once( ABSPATH . '/wp-admin/includes/file.php' );
 …
     /* Delete the existing avatar files for the object */
     bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
     /* Make sure we at least have a width and height for cropping */
     if ( !(int)$crop_w )
         $crop_w = BP_AVATAR_FULL_WIDTH;
     if ( !(int)$crop_h )
         $crop_h = BP_AVATAR_FULL_HEIGHT;
 …
     $full_filename = wp_hash( $original_file . time() ) . '-bpfull.jpg';
     $thumb_filename = wp_hash( $original_file . time() ) . '-bpthumb.jpg';
     /* Crop the image */
     $full_cropped = wp_crop_image( WP_CONTENT_DIR . $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_FULL_WIDTH, BP_AVATAR_FULL_HEIGHT, false, $avatar_folder_dir . '/' . $full_filename );
 …
     if ( is_object ( $id_or_email ) )
         $id_or_email = $id_or_email->user_id;
     $bp_avatar = bp_core_fetch_avatar( array( 'no_grav' => true, 'item_id' => $id_or_email, 'width' => $size, 'height' => $size, 'alt' => $alt ) );
 …
     if ( $file['error'] )
         return false;
     return true;
+}
 …
     if ( $file['file']['size'] > BP_AVATAR_ORIGINAL_MAX_FILESIZE )
         return false;
     return true;
+}
 …
     if ( ( strlen($file['file']['type']) && !preg_match('/(jpe?g|gif|png)$/', $file['file']['type'] ) ) && !preg_match( '/(jpe?g|gif|png)$/', $file['file']['name'] ) )
         return false;
     return true;
+}

trunk/bp-core/bp-core-catchuri.php

-                      r2027
+                      r2077
  *   - http:// domain.com / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
  *   - OUTSIDE ROOT: http:// domain.com / sites / buddypress / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
+ *
+ *
  *  Example:
  *    - http://domain.com/members/andy/profile/edit/group/5/
 …
  *    - $bp->current_action: string 'edit'
  *    - $bp->action_variables: array ['group', 5]
+ *
+ *
  * @package BuddyPress Core
  */
 …
     global $bp_unfiltered_uri;
     global $bp, $current_blog;
     if ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
         /* Only catch URI's on the root blog if we are not running BP on multiple blogs */
 …
             array_shift( $bp_uri );
+    }
     /* Set the indexes, these are incresed by one if we are not on a VHOST install */
     $component_index = 0;
     $action_index = $component_index + 1;
     // If this is a WordPress page, return from the function.
     if ( is_page( $bp_uri[$component_index] ) )
         return false;
     /* Get site path items */
     $paths = explode( '/', bp_core_get_site_path() );
 …
     $bp_uri = array_merge( array(), $bp_uri );
     $bp_unfiltered_uri = $bp_uri;
     /* If we are under anything with a members slug, set the correct globals */
     if ( $bp_uri[0] == BP_MEMBERS_SLUG ) {
         $is_member_page = true;
         $is_root_component = true;
+        $is_root_component = true;
+    }
     /* Catch a member page and set the current member ID */
     if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) ) {
         if ( ( $bp_uri[0] == BP_MEMBERS_SLUG && !empty( $bp_uri[1] ) ) || in_array( 'wp-load.php', $bp_uri ) ) {
+    if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) ) {
+        if ( ( $bp_uri[0] == BP_MEMBERS_SLUG && !empty( $bp_uri[1] ) ) || in_array( 'wp-load.php', $bp_uri ) ) {
             // We are within a member page, set up user id globals
             $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
 …
             unset($bp_uri[0]);
             unset($bp_uri[1]);
             /* Reset the keys by merging with an empty array */
             $bp_uri = array_merge( array(), $bp_uri );
 …
             $is_member_page = true;
             $is_root_component = true;
             // We are within a member page, set up user id globals
             $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[0] );
             unset($bp_uri[0]);
 …
+        }
+    }
     if ( !isset($is_root_component) )
         $is_root_component = in_array( $bp_uri[0], $bp->root_components );
 …
     /* Set the current component */
     $current_component = $bp_uri[$component_index];
     /* Set the current action */
     $current_action = $bp_uri[$action_index];
     /* Set the entire URI as the action variables, we will unset the current_component and action in a second */
     $action_variables = $bp_uri;
 …
     if ( 'no' == VHOST && !$is_root_component )
         array_shift($action_variables);
     /* Reset the keys by merging with an empty array */
     $action_variables = array_merge( array(), $action_variables );
 …
  * bp_catch_uri()
+ *
  * Takes either a single page name or array of page names and
+ * Takes either a single page name or array of page names and
  * loads the first template file that can be found.
+ *
  * Please don't call this function directly anymore, use: bp_core_load_template()
+ *
+ *
  * @package BuddyPress Core
  * @global $bp_path BuddyPress global containing the template file names to use.
 …
 function bp_catch_uri( $pages, $skip_blog_check = false ) {
     global $bp_path, $bp_skip_blog_check;
     $bp_skip_blog_check = $skip_blog_check;
 …
+ *
  * Loads the first template file found based on the $bp_path global.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp_path BuddyPress global containing the template file names to use.
 …
     global $bp_no_status_set;
     global $wp_query;
     /* Can be a single template or an array of templates */
+    /* Can be a single template or an array of templates */
     $templates = $bp_path;
     /* Don't hijack any URLs on blog pages */
     if ( bp_is_blog_page() ) {
 …
         status_header( 200 );
         $wp_query->is_404 = false;
         if ( $bp->current_component != BP_HOME_BLOG_SLUG )
             $wp_query->is_page = true;
+    }
     foreach ( (array)$templates as $template )
         $filtered_templates[] = $template . '.php';
     if ( $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates ) ) {
         load_template( apply_filters( 'bp_load_template', $located_template ) );
 …
  * If the extended profiles component is not installed we still need
  * to catch the /profile URI's and display whatever we have installed.
+ *
+ *
  */
 function bp_core_catch_profile_uri() {
     global $bp;
     if ( !function_exists('xprofile_install') )
         bp_core_load_template( apply_filters( 'bp_core_template_display_profile', 'profile/index' ) );

trunk/bp-core/bp-core-classes.php

-                      r2055
+                      r2077
  * BP_Core_User class can be used by any component. It will fetch useful
  * details for any user when provided with a user_id.
+ *
+ *
  * Example:
  *    $user = new BP_Core_User( $user_id );
 …
  *    $user_status = $user->status;
  *    etc.
+ *
+ *
  * @package BuddyPress Core
  */
 …
     var $fullname;
     var $email;
     var $user_url;
     var $user_link;
     var $last_active;
     var $profile_last_updated;
 …
     var $total_blogs;
     var $total_groups;
     function bp_core_user( $user_id, $populate_extras = false ) {
         if ( $user_id ) {
             $this->id = $user_id;
             $this->populate();
             if ( $populate_extras )
                 $this->populate_extras();
+        }
+    }
+    }
     /**
      * populate()
+     *
      * Populate the instantiated class with data based on the User ID provided.
+     *
+     *
      * @package BuddyPress Core
      * @global $userdata WordPress user data for the current logged in user.
 …
         $this->user_url = bp_core_get_userurl( $this->id );
         $this->user_link = bp_core_get_userlink( $this->id );
         $this->fullname = attribute_escape( bp_core_get_user_displayname( $this->id ) );
         $this->email = attribute_escape( bp_core_get_user_email( $this->id ) );
 …
         $this->avatar_mini = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) );
+    }
     function populate_extras() {
         global $bp;
         if ( function_exists('friends_install') ) {
+        if ( function_exists('friends_install') ) {
             $this->total_friends = BP_Friends_Friendship::total_friend_count( $this->id );
 …
                 else
                     $this->total_friends .= ' ' . __( 'friends', 'buddypress' );
                 $this->total_friends = '<a href="' . $this->user_url . $bp->friends->slug . '" title="' . sprintf( __( "%s's friend list", 'buddypress' ), $this->fullname ) . '">' . $this->total_friends . '</a>';
+            }
+        }
         if ( function_exists('bp_blogs_install') ) {
+        if ( function_exists('bp_blogs_install') ) {
             if ( $this->total_blogs ) {
                 if ( 1 == $this->total_blogs )
                     $this->total_blogs .= ' ' . __( 'blog', 'buddypress' );
                 else
                     $this->total_blogs .= ' ' . __( 'blogs', 'buddypress' );
+                    $this->total_blogs .= ' ' . __( 'blogs', 'buddypress' );
                 $this->total_blogs = '<a href="' . $this->user_url . $bp->blogs->slug . '" title="' . sprintf( __( "%s's blog list", 'buddypress' ), $this->fullname ) . '">' . $this->total_blogs . '</a>';
+            }
+        }
         if ( function_exists('groups_install') ) {
             $this->total_groups = BP_Groups_Member::total_group_count( $this->id );
             if ( $this->total_groups ) {
                 if ( 1 == $this->total_groups )
 …
+        }
+    }
     /* Static Functions */
     function get_newest_users( $limit = null, $page = 1 ) {
         global $wpdb;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         $total_users_sql = apply_filters( 'bp_core_newest_users_count_sql', "SELECT DISTINCT count(ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC" );
         $paged_users_sql = apply_filters( 'bp_core_newest_users_sql', "SELECT DISTINCT ID as user_id, DATE_ADD( user_registered, INTERVAL " . get_option('gmt_offset') . " HOUR ) as user_registered FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC{$pag_sql}", $pag_sql );
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+        $total_users = $wpdb->get_var( $total_users_sql );
+        $paged_users = $wpdb->get_results( $paged_users_sql );
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
     function get_active_users( $limit = null, $page = 1 ) {
         global $wpdb;
 …
         $total_users_sql = apply_filters( 'bp_core_active_users_count_sql', "SELECT DISTINCT count(um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC" );
         $paged_users_sql = apply_filters( 'bp_core_active_users_sql', "SELECT DISTINCT user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}", $pag_sql );
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
+        $total_users = $wpdb->get_var( $total_users_sql );
+        $paged_users = $wpdb->get_results( $paged_users_sql );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
 …
     function get_popular_users( $limit = null, $page = 1 ) {
         global $wpdb;
         if ( !function_exists('friends_install') )
             return false;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
     function get_random_users( $limit = null, $page = 1 ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
     function get_online_users( $limit = null, $page = 1 ) {
         global $wpdb;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
     function get_alphabetical_users( $limit = null, $page = 1 ) {
         global $wpdb, $bp;
 …
         if ( !function_exists( 'xprofile_install' ) )
             return BP_Core_User::get_active_users( $limit, $page );
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
     function get_users_by_letter( $letter, $limit = null, $page = 1 ) {
         global $wpdb, $bp;
         if ( !function_exists('xprofile_install') )
             return BP_Core_User::get_active_users( $limit, $page );
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( strlen($letter) > 1 || is_numeric($letter) || !$letter )
             return false;
         $letter = like_escape( $wpdb->escape( $letter ) );
 …
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
     function search_users( $search_terms, $limit = null, $page = 1 ) {
         global $wpdb, $bp;
         if ( !function_exists('xprofile_install') )
             return BP_Core_User::get_active_users( $limit, $page );
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $search_terms = like_escape( $wpdb->escape( $search_terms ) );
         $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT DISTINCT count(u.ID) as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
 …
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
 …
  * BP_Core_Notification class can be used by any component.
  * It will handle the fetching, saving and deleting of a user notification.
+ *
+ *
  * @package BuddyPress Core
  */
 …
     var $date_notified;
     var $is_new;
     function bp_core_notification( $id = false ) {
         if ( $id ) {
 …
+        }
+    }
     function populate() {
         global $wpdb, $bp;
         if ( $notification = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE id = %d", $this->id ) ) ) {
             $this->item_id = $notification->item_id;
 …
             $this->is_new = $notification->is_new;
+        }
+    }
+    }
     function save() {
         global $wpdb, $bp;
         if ( $this->id ) {
             // Update
 …
     /* Static functions */
     function check_access( $user_id, $notification_id ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->core->table_name_notifications} WHERE id = %d AND user_id = %d", $notification_id, $user_id ) );
+    }
     function get_all_for_user( $user_id ) {
         global $wpdb, $bp;
 …
         return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND is_new = 1", $user_id ) );
+    }
     function delete_for_user_by_type( $user_id, $component_name, $component_action ) {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND component_name = %s AND component_action = %s", $user_id, $component_name, $component_action ) );
+    }
     function delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id ) {
         global $wpdb, $bp;
         if ( $secondary_item_id )
             $secondary_item_sql = $wpdb->prepare( " AND secondary_item_id = %d", $secondary_item_id );
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND item_id = %d AND component_name = %s AND component_action = %s{$secondary_item_sql}", $user_id, $item_id, $component_name, $component_action ) );
+    }
     function delete_from_user_by_type( $user_id, $component_name, $component_action ) {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE item_id = %d AND component_name = %s AND component_action = %s", $user_id, $component_name, $component_action ) );
+    }
     function delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id ) {
         global $wpdb, $bp;
         if ( $component_action )
             $component_action_sql = $wpdb->prepare( "AND component_action = %s", $component_action );
         if ( $secondary_item_id )
             $secondary_item_sql = $wpdb->prepare( "AND secondary_item_id = %d", $secondary_item_id );
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE item_id = %d AND component_name = %s {$component_action_sql} {$secondary_item_sql}", $item_id, $component_name ) );
+    }
+}
+}

trunk/bp-core/bp-core-cssjs.php

-                      r2069
+                      r2077
+ *
  * Add the CSS needed for the admin bar on blogs (other than the root) and in the admin area.
+ *
+ *
  * @package BuddyPress Core
  * @uses get_option() Selects a site setting from the DB.
 …
 function bp_core_add_admin_bar_css() {
     global $current_blog;
     if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
         return false;
 …
+ *
  * Add the minor JS needed for the admin bar.
+ *
+ *
  * @package BuddyPress Core
  * @uses get_option() Selects a site setting from the DB.
 …
+ *
  * Add a hover-able icon to the "BuddyPress" wp-admin area menu.
+ *
+ *
  * @package BuddyPress Core
  */
 …
+}
 add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
 function bp_core_confirmation_js() {
 ?>
 …
+ *
  * Makes sure the jQuery jCrop library is loaded.
+ *
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_jquery_cropper() {
     wp_enqueue_script( 'jcrop', array( 'jquery' ) );
     add_action( 'wp_head', 'bp_core_add_cropper_inline_js' );
     add_action( 'wp_head', 'bp_core_add_cropper_inline_css' );
+    add_action( 'wp_head', 'bp_core_add_cropper_inline_js' );
+    add_action( 'wp_head', 'bp_core_add_cropper_inline_css' );
+}
 …
+ *
  * Adds the inline JS needed for the cropper to work on a per-page basis.
+ *
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_cropper_inline_js() {
     global $bp;
     $image = apply_filters( 'bp_inline_cropper_image', getimagesize( $bp->avatar_admin->image->dir ) );
     $aspect_ratio = 1;
+    $aspect_ratio = 1;
     /* Calculate Aspect Ratio */
     if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) )
+    if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) )
          $aspect_ratio = (int) constant( 'BP_AVATAR_FULL_WIDTH' ) / (int) constant( 'BP_AVATAR_FULL_HEIGHT' );
 ?>
 …
                 });
+            }
+        }
+        }
     </script>
 <?php
 …
+ *
  * Adds the inline CSS needed for the cropper to work on a per-page basis.
+ *
+ *
  * @package BuddyPress Core
  */
 …
+ *
  * Adds AJAX target URL so themes can access the WordPress AJAX functionality.
+ *
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_ajax_url_js() {
     global $bp;
     echo
+    echo
 '<script type="text/javascript">var ajaxurl = "' . $bp->root_domain . str_replace( 'index.php', 'wp-load.php', $_SERVER['SCRIPT_NAME'] ) . '";</script>
 ';
 …
+ *
  * Overrides the theme's admin bar CSS to hide the adminbar if disabled.
+ *
+ *
  * @package BuddyPress Core
  */
 function bp_core_override_adminbar_css() {
+function bp_core_override_adminbar_css() {
     if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
     ?>

trunk/bp-core/bp-core-notifications.php

-                      r1905
+                      r2077
 function bp_core_add_notification( $item_id, $user_id, $component_name, $component_action, $secondary_item_id = false, $date_notified = false ) {
     global $bp;
     if ( !$date_notified )
         $date_notified = time();
     $notification = new BP_Core_Notification;
     $notification->item_id = $item_id;
 …
     if ( $secondary_item_id )
         $notification->secondary_item_id = $secondary_item_id;
     if ( !$notification->save() )
         return false;
     return true;
+}
 …
     if ( !bp_core_check_notification_access( $bp->loggedin_user->id, $id ) )
         return false;
     return BP_Core_Notification::delete( $id );
+}
 function bp_core_get_notification( $id ) {
     return new BP_Core_Notification( $id );
+    return new BP_Core_Notification( $id );
+}
 function bp_core_get_notifications_for_user( $user_id ) {
     global $bp;
     $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++ ) {
         $notification = $notifications[$i];
         $grouped_notifications[$notification->component_name][$notification->component_action][] = $notification;
+    }
     if ( !$grouped_notifications )
         return false;
     /* Calculated a renderable outcome for each notification type */
     foreach ( $grouped_notifications as $component_name => $action_arrays ) {
         if ( !$action_arrays )
             continue;
         foreach ( $action_arrays as $component_action_name => $component_action_items ) {
             $action_item_count = count($component_action_items);
             if ( $action_item_count < 1 )
                 continue;
 …
+            }
+        }
+    }
+    }
     return $renderable;
+}
 …
     if ( !BP_Core_Notification::check_access( $user_id, $notification_id ) )
         return false;
     return true;
+}

trunk/bp-core/bp-core-settings.php

-                      r2059
+                      r2077
 if ( !defined( 'BP_SETTINGS_SLUG' ) )
     define( 'BP_SETTINGS_SLUG', 'settings' );
 function bp_core_add_settings_nav() {
     global $bp;
     /* Set up settings as a sudo-component for identification and nav selection */
     $bp->settings->id = 'settings';
     $bp->settings->slug = BP_SETTINGS_SLUG;
     /* Register this in the active components array */
     $bp->active_components[$bp->settings->slug] = $bp->settings->id;
 …
     $settings_link = $bp->loggedin_user->domain . 'settings/';
     bp_core_new_subnav_item( array( 'name' => __( 'General', 'buddypress' ), 'slug' => 'general', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_general_settings', 'position' => 10, 'user_has_access' => bp_is_home() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_home() ) );
     if ( !is_site_admin() && !(int) get_site_option( 'bp-disable-account-deletion' ) )
         bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_home() ) );
 …
 function bp_core_screen_general_settings() {
     global $current_user, $bp_settings_updated, $pass_error;
     $bp_settings_updated = false;
     $pass_error = false;
     if ( isset($_POST['submit']) ) {
         check_admin_referer('bp_settings_general');
         require_once( WPINC . '/registration.php' );
         // Form has been submitted and nonce checks out, lets do it.
         if ( $_POST['email'] != '' )
             $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) );
 …
             unset( $current_user->user_pass );
+        }
         if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
             $bp_settings_updated = true;
+    }
     add_action( 'bp_template_title', 'bp_core_screen_general_settings_title' );
     add_action( 'bp_template_content', 'bp_core_screen_general_settings_content' );
     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+}
 …
         </div>
     <?php } ?>
     <?php if ( $pass_error && !$bp_settings_updated ) { ?>
         <div id="message" class="error fade">
             <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
         </div>
+        </div>
     <?php } ?>
 …
         <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
         <input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->user_email ); ?>" class="settings-input" />
         <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
         <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?><br />
         <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
         <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
         <?php wp_nonce_field('bp_settings_general') ?>
 …
 function bp_core_screen_notification_settings() {
     global $current_user, $bp_settings_updated;
     $bp_settings_updated = false;
     if ( $_POST['submit'] ) {
         check_admin_referer('bp_settings_notifications');
         if ( $_POST['notifications'] ) {
             foreach ( $_POST['notifications'] as $key => $value ) {
 …
+            }
+        }
         $bp_settings_updated = true;
+    }
     add_action( 'bp_template_title', 'bp_core_screen_notification_settings_title' );
     add_action( 'bp_template_content', 'bp_core_screen_notification_settings_content' );
     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+}
 …
         </div>
     <?php } ?>
     <form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
         <h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
         <p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
         <?php do_action( 'bp_notification_settings' ) ?>
         <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+        <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
         <?php wp_nonce_field('bp_settings_notifications') ?>
     </form>
 <?php
 …
 /**** DELETE ACCOUNT ****/
 function bp_core_screen_delete_account() {
+function bp_core_screen_delete_account() {
     if ( isset( $_POST['delete-account-understand'] ) ) {
         check_admin_referer( 'delete-account' );
 …
             bp_core_redirect( site_url() );
+    }
     add_action( 'bp_template_title', 'bp_core_screen_delete_account_title' );
     add_action( 'bp_template_content', 'bp_core_screen_delete_account_content' );
     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+}
 …
     <form action="<?php echo $bp->loggedin_user->domain . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
         <div id="message" class="info">
             <p><?php _e( 'WARNING: Deleting your account will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'buddypress' ); ?></p>
         </div>
         <input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-account-button').disabled = ''; } else { document.getElementById('delete-account-button').disabled = 'disabled'; }" /> <?php _e( 'I understand the consequences of deleting my account.', 'buddypress' ); ?>
         <p><input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?> &raquo;" id="delete-account-button" name="delete-account-button" /></p>

trunk/bp-core/bp-core-signup.php

-                      r2068
+                      r2077
 function bp_core_screen_signup() {
     global $bp, $wpdb;
     if ( $bp->current_component != BP_REGISTER_SLUG )
         return false;
     /* If the user is logged in, redirect away from here */
     if ( is_user_logged_in() )
         bp_core_redirect( $bp->root_domain );
     /***
      * For backwards compatibility with the old pre 1.1 two theme system, skip this screen function
 …
     if ( 'none' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() )
         bp_core_redirect( $bp->root_domain );
     $bp->signup->step = 'request-details';
     /* If the signup page is submitted, validate and save */
     if ( isset( $_POST['signup_submit'] ) ) {
         /* Check the nonce */
         check_admin_referer( 'bp_new_signup' );
         require_once( ABSPATH . WPINC . '/registration.php' );
         /* Check the base account details for problems */
         $account_details = wpmu_validate_user_signup( $_POST['signup_username'] , $_POST['signup_email'] );
         /* If there are errors with account details, set them for display */
         if ( !empty( $account_details['errors']->errors['user_name'] ) )
             $bp->signup->errors['signup_username'] = $account_details['errors']->errors['user_name'][0];
         if ( !empty( $account_details['errors']->errors['user_email'] ) )
             $bp->signup->errors['signup_email'] = $account_details['errors']->errors['user_email'][0];
         /* Check that both password fields are filled in */
         if ( empty( $_POST['signup_password'] ) || empty( $_POST['signup_password_confirm'] ) )
 …
         /* Loop through the posted fields formatting any datebox values then validate the field */
         foreach ( (array) $profile_field_ids as $field_id ) {
+        foreach ( (array) $profile_field_ids as $field_id ) {
             if ( !isset( $_POST['field_' . $field_id] ) ) {
                 if ( isset( $_POST['field_' . $field_id . '_day'] ) )
                     $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
+            }
             if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
                 $bp->signup->errors['field_' . $field_id] = __( 'This is a required field', 'buddypress' );
 …
         if ( isset( $_POST['signup_with_blog'] ) ) {
             $active_signup = get_site_option( 'registration' );
             if ( 'blog' == $active_signup || 'all' == $active_signup ) {
                 $blog_details = wpmu_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
                 /* If there are errors with blog details, set them for display */
                 if ( !empty( $blog_details['errors']->errors['blogname'] ) )
 …
         } else {
             $bp->signup->step = 'save-details';
             /* No errors! Let's register those deets. */
             $active_signup = get_site_option( 'registration' );
             if ( 'none' != $active_signup ) {
                 /* Let's compact any profile field info into usermeta */
                 $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
                 /* Loop through the posted fields formatting any datebox values then add to usermeta */
                 foreach ( (array) $profile_field_ids as $field_id ) {
+                foreach ( (array) $profile_field_ids as $field_id ) {
                     if ( !isset( $_POST['field_' . $field_id] ) ) {
                         if ( isset( $_POST['field_' . $field_id . '_day'] ) )
                             $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
+                    }
                     if ( !empty( $_POST['field_' . $field_id] ) )
                         $usermeta['field_' . $field_id] = $_POST['field_' . $field_id];
+                }
                 /* Store the profile field ID's in usermeta */
                 $usermeta['profile_field_ids'] = $_POST['signup_profile_field_ids'];
                 /* Hash and store the password */
                 $usermeta['password'] = wp_hash_password( $_POST['signup_password'] );
                 /* If the user decided to create a blog, save those details to usermeta */
                 if ( 'blog' == $active_signup || 'all' == $active_signup ) {
                     $usermeta['public'] = ( 'public' == $_POST['signup_blog_privacy'] ) ? true : false;
+                }
                 $usermeta = apply_filters( 'bp_signup_usermeta', $usermeta );
                 /* Finally, sign up the user and/or blog*/
                 if ( isset( $_POST['signup_with_blog'] ) )
 …
                 else
                     wpmu_signup_user( $_POST['signup_username'], $_POST['signup_email'], $usermeta );
                 $bp->signup->step = 'completed-confirmation';
+            }
 …
             do_action( 'bp_complete_signup' );
+        }
+    }
 …
     /* If user has uploaded a new avatar */
     if ( !empty( $_FILES ) ) {
         /* Check the nonce */
         check_admin_referer( 'bp_avatar_upload' );
         $bp->signup->step = 'completed-confirmation';
         /* Get the activation key */
         if ( !$bp->signup->key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $_POST[ 'signup_username' ], $_POST[ 'signup_email' ] ) ) ) {
 …
             /* Hash the key to create the upload folder (added security so people don't sniff the activation key) */
             $bp->signup->avatar_dir = wp_hash( $bp->signup->key );
             /* Pass the file to the avatar upload handler */
             if ( bp_core_avatar_handle_upload( $_FILES, 'bp_core_signup_avatar_upload_dir' ) ) {
+            /* Pass the file to the avatar upload handler */
+            if ( bp_core_avatar_handle_upload( $_FILES, 'bp_core_signup_avatar_upload_dir' ) ) {
                 $bp->avatar_admin->step = 'crop-image';
                 /* Make sure we include the jQuery jCrop file for image cropping */
                 add_action( 'wp', 'bp_core_add_jquery_cropper' );
+            }
+            }
+        }
+    }
     /* If the image cropping is done, crop the image and save a full/thumb version */
     if ( isset( $_POST['avatar-crop-submit'] ) ) {
         /* Check the nonce */
         check_admin_referer( 'bp_avatar_cropstore' );
         /* Reset the avatar step so we can show the upload form again if needed */
         $bp->signup->step = 'completed-confirmation';
 …
+    }
     bp_core_load_template( 'registration/register' );
+    bp_core_load_template( 'registration/register' );
+}
 add_action( 'wp', 'bp_core_screen_signup', 3 );
 …
     if ( !$bp->signup->avatar_dir )
         return false;
     $path = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
     $newdir = WP_CONTENT_DIR . str_replace( 'wp-content', '', $path );
 …
     $newbdir = $newdir;
     if ( !file_exists( $newdir ) )
         @wp_mkdir_p( $newdir );
 …
     $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
     return apply_filters( 'bp_core_signup_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+    return apply_filters( 'bp_core_signup_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+}
 …
     if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
          wp_redirect( bp_root_domain() . BP_REGISTER_SLUG );
+        wp_redirect( bp_root_domain() . BP_REGISTER_SLUG );
+}
 add_action( 'signup_header', 'bp_core_wpsignup_redirect' );
 ?>

trunk/bp-core/bp-core-templatetags.php

-                      r2074
+                      r2077
  * Uses the $bp->bp_nav global to render out the navigation within a BuddyPress install.
  * Each component adds to this navigation array within its own [component_name]_setup_nav() function.
+ *
+ *
  * This navigation array is the top level navigation, so it contains items such as:
  *      [Blog, Profile, Messages, Groups, Friends] ...
 …
 function bp_get_loggedin_user_nav() {
     global $bp, $current_blog;
     /* Loop through each navigation item */
     foreach( (array) $bp->bp_nav as $nav_item ) {
 …
             $selected = '';
+        }
         /* If we are viewing another person (current_userid does not equal loggedin_user->id)
            then check to see if the two users are friends. if they are, add a highlight CSS class
 …
         if ( !bp_is_home() && $bp->displayed_user->id ) {
             $selected = '';
             if ( function_exists('friends_install') ) {
                 if ( $nav_item['css_id'] == $bp->friends->id ) {
 …
+            }
+        }
         /* echo out the final list item */
         echo apply_filters( 'bp_get_loggedin_user_nav_' . $nav_item['css_id'], '<li id="li-nav-' . $nav_item['css_id'] . '" ' . $selected . '><a id="my-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a></li>', &$nav_item );
+    }
     /* Always add a log out list item to the end of the navigation */
     if ( function_exists( 'wp_logout_url' ) ) {
         $logout_link = '<li><a id="wp-logout" href="' .  wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+        $logout_link = '<li><a id="wp-logout" href="' .  wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
     } else {
         $logout_link = '<li><a id="wp-logout" href="' . site_url() . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+    }
     echo apply_filters( 'bp_logout_nav_link', $logout_link );
+}
 …
     foreach ( $bp->bp_nav as $user_nav_item ) {
         if ( !$user_nav_item['show_for_displayed_user'] )
+        if ( !$user_nav_item['show_for_displayed_user'] )
             continue;
         if ( $bp->current_component == $user_nav_item['css_id'] )
             $selected = ' class="current"';
         else
             $selected = '';
         if ( $bp->loggedin_user->domain )
             $link = str_replace( $bp->loggedin_user->domain, $bp->displayed_user->domain, $user_nav_item['link'] );
         else
             $link = $bp->displayed_user->domain . $user_nav_item['link'];
         echo apply_filters( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], '<li id="li-subnav-' . $user_nav_item['css_id'] . '" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item );
+    }
+    }
+}
     /* DEPRECATED - use bp_get_displayed_user_nav() */
     function bp_get_user_nav() { bp_get_displayed_user_nav(); }
 /**
  * bp_get_options_nav()
 …
  * Uses the $bp->bp_options_nav global to render out the sub navigation for the current component.
  * Each component adds to its sub navigation array within its own [component_name]_setup_nav() function.
+ *
+ *
  * This sub navigation array is the secondary level navigation, so for profile it contains:
  *      [Public, Edit Profile, Change Avatar]
 …
  * The function will also analyze the current action for the current component to determine whether
  * or not to highlight a particular sub nav item.
+ *
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
         if ( count( $bp->bp_options_nav[$bp->current_component] ) < 1 )
             return false;
         /* Loop through each navigation item */
         foreach ( $bp->bp_options_nav[$bp->current_component] as $subnav_item ) {
             if ( !$subnav_item['user_has_access'] )
                 continue;
             /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
             if ( $subnav_item['slug'] == $bp->current_action ) {
 …
                 $selected = '';
+            }
             /* echo out the final list item */
             echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="li-subnav-' . $subnav_item['css_id'] . '" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
+            echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="li-subnav-' . $subnav_item['css_id'] . '" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
+        }
     } else {
 …
 function bp_get_options_title() {
     global $bp;
     if ( empty( $bp->bp_options_title ) )
         $bp->bp_options_title = __( 'Options', 'buddypress' );
     echo apply_filters( 'bp_get_options_title', attribute_escape( $bp->bp_options_title ) );
+}
 /** AVATAR TEMPLATE TAGS *******************************************************/
 …
 function bp_has_options_avatar() {
     global $bp;
     if ( empty( $bp->bp_options_avatar ) )
         return false;
     return true;
+}
 …
 function bp_comment_author_avatar() {
     global $comment;
     if ( function_exists('bp_core_fetch_avatar') ) {
         echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb' ) ) );
+        echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb' ) ) );
     } else if ( function_exists('get_avatar') ) {
         get_avatar();
 …
 function bp_post_author_avatar() {
     global $post;
     if ( function_exists('bp_core_fetch_avatar') ) {
         echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb' ) ) );
+        echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb' ) ) );
     } else if ( function_exists('get_avatar') ) {
         get_avatar();
 …
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+    }
+    }
 function bp_displayed_user_avatar( $args = '' ) {
 …
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+    }
+    }
 function bp_avatar_admin_step() {
 …
     function bp_get_avatar_to_crop_src() {
         global $bp;
         return apply_filters( 'bp_get_avatar_to_crop_src', str_replace( WP_CONTENT_DIR, '', $bp->avatar_admin->image->dir ) );
+    }
 function bp_avatar_cropper() {
     global $bp;
     echo '<img id="avatar-to-crop" class="avatar" src="' . $bp->avatar_admin->image . '" />';
+}
 …
 function bp_is_home() {
     global $bp;
     if ( is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
         return true;
     return false;
+}
 …
 function bp_last_activity( $user_id = false, $echo = true ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     $last_activity = bp_core_get_last_activity( get_usermeta( $user_id, 'last_activity' ), __('active %s ago', 'buddypress') );
 …
 function bp_user_link() {
     global $bp;
     echo apply_filters( 'bp_the_avatar_thumbnail', $bp->displayed_user->domain );
+}
 …
 function bp_get_loggedin_user_link() {
     global $bp;
     return $bp->loggedin_user->domain;
+}
 …
 function bp_get_displayed_user_link() {
     global $bp;
     return $bp->displayed_user->domain;
+}
 …
 function bp_core_get_wp_profile() {
     global $bp;
     $ud = get_userdata( $bp->displayed_user->id );
 ?>
 …
     if ( function_exists($component_name . '_install') )
         return true;
     return false;
+}
 …
 function bp_format_time( $time, $just_date = false ) {
     $date = date( get_option('date_format'), $time );
     if ( !$just_date ) {
         $date .= ' ' . __( 'at', 'buddypress' ) . date( ' ' . get_option('time_format'), $time );
+    }
     return apply_filters( 'bp_format_time', $date );
+}
 …
 function bp_word_or_name( $youtext, $nametext, $capitalize = true, $echo = true ) {
     global $bp;
     if ( $capitalize )
         $youtext = bp_core_ucfirst($youtext);
     if ( $bp->displayed_user->id == $bp->loggedin_user->id ) {
         if ( $echo )
 …
 function bp_your_or_their( $capitalize = true, $echo = true ) {
     global $bp;
     if ( $capitalize )
         $yourtext = bp_core_ucfirst($yourtext);
     if ( $bp->displayed_user->id == $bp->loggedin_user->id ) {
         if ( $echo )
 …
 function bp_loggedinuser_link() {
     global $bp;
     if ( $link = bp_core_get_userlink( $bp->loggedin_user->id ) ) {
         echo apply_filters( 'bp_loggedinuser_link', $link );
 …
             $title = __( 'Blog &#8212; ' . $post->post_title, 'buddypress' );
         } else if ( is_category() ) {
             $title = __( 'Blog &#8212; Categories &#8212; ' . ucwords( $wp_query->query_vars['category_name'] ), 'buddypress' );
+            $title = __( 'Blog &#8212; Categories &#8212; ' . ucwords( $wp_query->query_vars['category_name'] ), 'buddypress' );
         } else if ( is_tag() ) {
             $title = __( 'Blog &#8212; Tags &#8212; ' . ucwords( $wp_query->query_vars['tag'] ), 'buddypress' );
+            $title = __( 'Blog &#8212; Tags &#8212; ' . ucwords( $wp_query->query_vars['tag'] ), 'buddypress' );
         } else
             $title = __( 'Blog', 'buddypress' );
 …
         $title = get_the_title($post->ID);
+    }
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
         $blog_title = get_blog_option( $current_blog->blog_id, 'blogname' );
     } else {
         $blog_title = get_blog_option( BP_ROOT_BLOG, 'blogname' );
+    }
+        $blog_title = get_blog_option( BP_ROOT_BLOG, 'blogname' );
+    }
     return apply_filters( 'bp_page_title', $blog_title . ' &#8212; ' . attribute_escape( $title ), attribute_escape( $title ) );
+}
 …
 function bp_is_page($page) {
     global $bp;
     if ( $bp->displayed_user->id || $bp->is_single_item )
         return false;
     if ( $page == $bp->current_component || ( is_home() && $page == 'home' && $bp->current_component == $bp->default_component ) || ( $page == BP_MEMBERS_SLUG && !$bp->current_component ) )
         return true;
     return false;
+}
 …
     if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template') . '/registration/register.php') )
         return true;
     return false;
+}
 …
     function bp_get_signup_page() {
         global $bp;
         if ( bp_has_custom_signup_page() ) {
                 return apply_filters( 'bp_get_signup_page', $bp->root_domain . '/' . BP_REGISTER_SLUG );
 …
     if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template') . '/registration/activate.php') )
         return true;
     return false;
+}
 …
 function bp_activation_page( $echo = true ) {
     global $bp;
     if ( bp_has_custom_activation_page() ) {
         if ( $echo )
 …
 function bp_search_form_action() {
     global $bp;
     return apply_filters( 'bp_search_form_action', $bp->root_domain . '/search' );
+}
 …
     // Eventually this won't be needed and a page will be built to integrate all search results.
     $selection_box = '<select name="search-which" id="search-which" style="width: auto">';
     if ( function_exists( 'xprofile_install' ) ) {
         $selection_box .= '<option value="members">' . __( 'Members', 'buddypress' ) . '</option>';
+    }
     if ( function_exists( 'groups_install' ) ) {
         $selection_box .= '<option value="groups">' . __( 'Groups', 'buddypress' ) . '</option>';
 …
         $selection_box .= '<option value="forums">' . __( 'Forums', 'buddypress' ) . '</option>';
+    }
     if ( function_exists( 'bp_blogs_install' ) ) {
         $selection_box .= '<option value="blogs">' . __( 'Blogs', 'buddypress' ) . '</option>';
+    }
     $selection_box .= '</select>';
     return apply_filters( 'bp_search_form_type_select', $selection_box );
+}
 …
     $form = '
         <form action="' . bp_search_form_action() . '" method="post" id="search-form">
             <input type="text" id="search-terms" name="search-terms" value="" />
+            <input type="text" id="search-terms" name="search-terms" value="" />
             ' . bp_search_form_type_select() . '
             <input type="submit" name="search-submit" id="search-submit" value="' . __( 'Search', 'buddypress' ) . '" />
             ' . wp_nonce_field( 'bp_search_form' ) . '
         </form>
     ';
     echo apply_filters( 'bp_search_form', $form );
+}
 …
         $logout_link = '<a href="' . wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
     else
         $logout_link = '<a href="' . $bp->root_domain . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
+        $logout_link = '<a href="' . $bp->root_domain . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
     echo apply_filters( 'bp_logout_link', $logout_link );
 …
 function bp_profile_wire_can_post() {
     global $bp;
     if ( bp_is_home() )
         return true;
     if ( function_exists('friends_install') ) {
         if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
 …
         else
             return false;
+    }
+    }
     return true;
+}
 …
     <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
     <li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a></li>
     <?php if ( function_exists( 'groups_install' ) ) { ?>
         <li<?php if ( bp_is_page( $bp->groups->slug ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo $bp->groups->slug ?>" title="<?php _e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a></li>
     <?php } ?>
     <?php if ( function_exists( 'bp_blogs_install' ) ) { ?>
         <li<?php if ( bp_is_page( $bp->blogs->slug ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo $bp->blogs->slug ?>" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a></li>
 …
 function bp_is_directory() {
     global $bp;
     return $bp->is_directory;
+}
 …
+ *
  * Fakes an excerpt on any content. Will not truncate words.
+ *
+ *
  * @package BuddyPress Core
  * @param $text str The text to create the excerpt from
 …
         $text = implode(' ', $words);
+    }
     return apply_filters( 'bp_create_excerpt', $text );
+}
 …
+ *
  * Checks to see if the data passed has been serialized.
+ *
+ *
  * @package BuddyPress Core
  * @param $data str The data that will be checked
 …
         return apply_filters( 'bp_get_signup_with_blog_value', $_POST['signup_with_blog'] );
+    }
 function bp_signup_blog_url_value() {
     echo bp_get_signup_blog_url_value();
 …
     function bp_get_signup_avatar_dir_value() {
         global $bp;
         return apply_filters( 'bp_get_signup_avatar_dir_value', $bp->signup->avatar_dir );
+    }
 …
     function bp_get_current_signup_step() {
         global $bp;
         return $bp->signup->step;
+    }
 …
     function bp_get_signup_avatar( $args = '' ) {
         global $bp;
         $defaults = array(
             'size' => BP_AVATAR_FULL_WIDTH,
             'class' => 'avatar',
             'alt' => __( 'Your Avatar', 'buddypress' )
+            'alt' => __( 'Your Avatar', 'buddypress' )
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
 …
                 $default_grav = $bp->grav_default->user;
+            }
             $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
             return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
 …
 function bp_account_was_activated() {
     global $bp;
     return $bp->activation_complete;
+}
 …
     var $pag_links;
     var $total_member_count;
     function bp_core_members_template( $type, $per_page, $max ) {
         global $bp, $bp_the_member_query;
 …
         $this->pag_page = isset( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
         if ( isset( $_REQUEST['s'] ) && '' != $_REQUEST['s'] && $type != 'random' ) {
             $this->members = BP_Core_User::search_users( $_REQUEST['s'], $this->pag_num, $this->pag_page );
 …
                     $this->members = BP_Core_User::get_random_users( $this->pag_num, $this->pag_page );
                     break;
                 case 'newest':
                     $this->members = BP_Core_User::get_newest_users( $this->pag_num, $this->pag_page );
 …
                 case 'popular':
                     $this->members = BP_Core_User::get_popular_users( $this->pag_num, $this->pag_page );
                     break;
+                    break;
                 case 'online':
                     $this->members = BP_Core_User::get_online_users( $this->pag_num, $this->pag_page );
                     break;
                 case 'alphabetical':
                     $this->members = BP_Core_User::get_alphabetical_users( $this->pag_num, $this->pag_page );
                     break;
                 case 'active': default:
                     $this->members = BP_Core_User::get_active_users( $this->pag_num, $this->pag_page );
                     break;
+                    break;
+            }
+        }
         if ( !$max || $max >= (int)$this->members['total'] )
             $this->total_member_count = (int)$this->members['total'];
 …
             $this->member_count = count($this->members);
+        }
         if ( (int) $this->total_member_count && (int) $this->pag_num ) {
+        if ( (int) $this->total_member_count && (int) $this->pag_num ) {
             $this->pag_links = paginate_links( array(
                 'base' => add_query_arg( 'upage', '%#%' ),
 …
                 'next_text' => '&raquo;',
                 'mid_size' => 1
             ));
+            ));
+        }
+    }
     function has_members() {
         if ( $this->member_count )
             return true;
         return false;
+    }
     function next_member() {
         $this->current_member++;
         $this->member = $this->members[$this->current_member];
         return $this->member;
+    }
     function rewind_members() {
         $this->current_member = -1;
 …
+        }
+    }
     function site_members() {
+    function site_members() {
         if ( $this->current_member + 1 < $this->member_count ) {
             return true;
 …
         return false;
+    }
     function the_member() {
         global $member, $bp;
 …
             wp_cache_set( 'bp_user_' . $user_id, $this->member, 'bp' );
+        }
         if ( $user_registered )
             $this->member->user_registered = $user_registered;
         if ( 0 == $this->current_member ) // loop has just started
             do_action('loop_start');
 …
 function bp_rewind_site_members() {
     global $site_members_template;
     return $site_members_template->rewind_members();
+}
 …
     // type: active ( default ) | random | newest | popular | online | alphabetical
     if ( $max ) {
         if ( $per_page > $max )
 …
     $site_members_template = new BP_Core_Members_Template( $type, $per_page, $max );
     return $site_members_template->has_members();
+}
 …
 function bp_site_members_pagination_count() {
     global $bp, $site_members_template;
     $from_num = intval( ( $site_members_template->pag_page - 1 ) * $site_members_template->pag_num ) + 1;
     $to_num = ( $from_num + ( $site_members_template->pag_num - 1 ) > $site_members_template->total_member_count ) ? $site_members_template->total_member_count : $from_num + ( $site_members_template->pag_num - 1) ;
 …
     function bp_get_site_members_pagination_links() {
         global $site_members_template;
         return apply_filters( 'bp_get_site_members_pagination_links', $site_members_template->pag_links );
+    }
 function bp_the_site_member_user_id() {
     echo bp_get_the_site_member_user_id();
+}
     function bp_get_the_site_member_user_id() {
         global $site_members_template;
         return apply_filters( 'bp_get_the_site_member_user_id', $site_members_template->member->id );
+function bp_the_site_member_user_id() {
+    echo bp_get_the_site_member_user_id();
+}
+    function bp_get_the_site_member_user_id() {
+        global $site_members_template;
+        return apply_filters( 'bp_get_the_site_member_user_id', $site_members_template->member->id );
+    }
 …
     echo apply_filters( 'bp_the_site_member_avatar', bp_get_the_site_member_avatar() );
+}
     function bp_get_the_site_member_avatar() {
         global $site_members_template;
+    function bp_get_the_site_member_avatar() {
+        global $site_members_template;
         return apply_filters( 'bp_get_the_site_member_avatar', $site_members_template->member->avatar_thumb );
 …
         return apply_filters( 'bp_the_site_member_last_active', strtotime( $site_members_template->member->user_registered ) );
+    }
 function bp_the_site_member_add_friend_button() {
     global $site_members_template;
     if ( function_exists( 'bp_add_friend_button' ) ) {
         echo bp_add_friend_button( $site_members_template->member->id );
 …
 function bp_the_site_member_total_friend_count() {
     global $site_members_template;
     if ( !(int) $site_members_template->member->total_friends )
         return false;
     echo bp_get_the_site_member_total_friend_count();
+}
 …
             return apply_filters( 'bp_get_the_site_member_total_friend_count', sprintf( __( '%d friend', 'buddypress' ), (int) $site_members_template->member->total_friends ) );
         else
             return apply_filters( 'bp_get_the_site_member_total_friend_count', sprintf( __( '%d friends', 'buddypress' ), (int) $site_members_template->member->total_friends ) );
+    }
+            return apply_filters( 'bp_get_the_site_member_total_friend_count', sprintf( __( '%d friends', 'buddypress' ), (int) $site_members_template->member->total_friends ) );
+    }
 function bp_the_site_member_random_profile_data() {
     global $site_members_template;
 …
 function bp_home_blog_url() {
     global $bp, $current_blog;
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
         $blog_id = $current_blog->blog_id;
 …
     function bp_get_loggedin_user_fullname() {
         global $bp;
         return apply_filters( 'bp_get_loggedin_user_fullname', $bp->loggedin_user->fullname );
+        return apply_filters( 'bp_get_loggedin_user_fullname', $bp->loggedin_user->fullname );
+    }
 function bp_current_component() {
     global $bp;
     return apply_filters( 'bp_current_component', $bp->current_component );
+    return apply_filters( 'bp_current_component', $bp->current_component );
+}
 function bp_current_action() {
     global $bp;
     return apply_filters( 'bp_current_action', $bp->current_action );
+    return apply_filters( 'bp_current_action', $bp->current_action );
+}
 function bp_current_item() {
     global $bp;
     return apply_filters( 'bp_current_item', $bp->current_item );
+    return apply_filters( 'bp_current_item', $bp->current_item );
+}
 function bp_action_variables() {
     global $bp;
     return apply_filters( 'bp_action_variables', $bp->action_variables );
+    return apply_filters( 'bp_action_variables', $bp->action_variables );
+}
 …
     function bp_get_root_domain() {
         global $bp;
         return $bp->root_domain;
+    }
 …
 function bp_is_profile_component() {
     global $bp;
     if ( BP_XPROFILE_SLUG == $bp->current_component )
         return true;
     return false;
+}
 …
 function bp_is_activity_component() {
     global $bp;
     if ( BP_ACTIVITY_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_blogs_component() {
     global $bp;
     if ( BP_BLOGS_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_wire_component() {
     global $bp;
     if ( BP_WIRE_SLUG == $bp->current_action || in_array( BP_WIRE_SLUG, (array)$bp->action_variables ) )
         return true;
     return false;
+    return false;
+}
 function bp_is_messages_component() {
     global $bp;
     if ( BP_MESSAGES_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_friends_component() {
     global $bp;
     if ( BP_FRIENDS_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_groups_component() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_settings_component() {
     global $bp;
     if ( BP_SETTINGS_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_user_activity() {
     global $bp;
     if ( BP_ACTIVITY_SLUG == $bp->current_component && ( !$bp->current_action || 'my-activity' == $bp->current_action ) )
         return true;
     return false;
+}
+    return false;
+}
 function bp_is_user_friends_activity() {
     global $bp;
     if ( BP_ACTIVITY_SLUG == $bp->current_component && 'my-friends' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_user_profile() {
     global $bp;
     if ( BP_XPROFILE_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_profile_edit() {
     global $bp;
     if ( BP_XPROFILE_SLUG == $bp->current_component && 'edit' == $bp->current_action )
         return true;
     return false;
+}
 …
 function bp_is_change_avatar() {
     global $bp;
     if ( BP_XPROFILE_SLUG == $bp->current_component && 'change-avatar' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_profile_wire() {
     global $bp;
     if ( BP_XPROFILE_SLUG == $bp->current_component && 'wire' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_user_groups() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && ( !$bp->current_action || 'my-groups' == $bp->current_action ) )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_home() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_create() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && 'create' == $bp->current_action )
         return true;
     return false;
+}
 …
 function bp_is_group_admin_page() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'admin' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_wire() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'wire' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_forum() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'forum' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_forum_topic() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0] )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_members() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'members' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_invites() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && 'invites' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_group_leave() {
     global $bp;
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'leave-group' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 …
 function bp_is_user_blogs() {
     global $bp;
     if ( BP_BLOGS_SLUG == $bp->current_component && ( !$bp->current_action || 'my-blogs' == $bp->current_action ) )
         return true;
     return false;
+    return false;
+}
 function bp_is_user_recent_posts() {
     global $bp;
     if ( BP_BLOGS_SLUG == $bp->current_component && 'recent-posts' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_user_recent_commments() {
     global $bp;
     if ( BP_BLOGS_SLUG == $bp->current_component && 'recent-comments' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_create_blog() {
     global $bp;
     if ( BP_BLOGS_SLUG == $bp->current_component && 'create-a-blog' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_user_friends() {
     global $bp;
     if ( BP_FRIENDS_SLUG == $bp->current_component && ( !$bp->current_action || 'my-friends' == $bp->current_action ) )
         return true;
     return false;
+    return false;
+}
 function bp_is_friend_requests() {
     global $bp;
     if ( BP_FRIENDS_SLUG == $bp->current_component && 'requests' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_messages_inbox() {
     global $bp;
     if ( BP_MESSAGES_SLUG == $bp->current_component && ( !$bp->current_action || 'inbox' == $bp->current_action ) )
         return true;
     return false;
+    return false;
+}
 function bp_is_messages_sentbox() {
     global $bp;
     if ( BP_MESSAGES_SLUG == $bp->current_component && 'sentbox' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 …
 function bp_is_notices() {
     global $bp;
     if ( BP_MESSAGES_SLUG == $bp->current_component && 'notices' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 …
 function bp_is_messages_compose_screen() {
     global $bp;
     if ( BP_MESSAGES_SLUG == $bp->current_component && 'compose' == $bp->current_action )
         return true;
     return false;
+    return false;
+}
 function bp_is_single_item() {
     global $bp;
     if ( $bp->is_single_item )
         return true;
     return false;
+}
 …
 function bp_is_activation_page() {
     global $bp;
     if ( BP_ACTIVATION_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 function bp_is_register_page() {
     global $bp;
     if ( BP_REGISTER_SLUG == $bp->current_component )
         return true;
     return false;
+    return false;
+}
 …
         global $bp;
         if ( bp_is_blog_page() && is_front_page() && $bp->current_component != BP_HOME_BLOG_SLUG )
             $bp_classes[] = 'home-page';
+        if ( bp_is_blog_page() && is_front_page() && $bp->current_component != BP_HOME_BLOG_SLUG )
+            $bp_classes[] = 'home-page';
         if ( bp_is_blog_page() || bp_is_register_page() || bp_is_activation_page() )
             $bp_classes[] = 'blog-page';
         if ( !bp_is_blog_page() && !bp_is_register_page() && !bp_is_activation_page() )
             $bp_classes[] = 'internal-page';
         if ( bp_is_directory() )
             $bp_classes[] = 'directory';
         if ( bp_is_user_profile() && !bp_is_blog_page() )
             $bp_classes[] = 'profile';
         if ( bp_is_activity_component() && !bp_is_blog_page()  )
             $bp_classes[] = 'activity';
+            $bp_classes[] = 'activity';
         if ( bp_is_blogs_component() && !bp_is_blog_page()  )
 …
         if ( bp_is_messages_component() && !bp_is_blog_page()  )
             $bp_classes[] = 'messages';
+            $bp_classes[] = 'messages';
         if ( bp_is_friends_component() && !bp_is_blog_page()  )
             $bp_classes[] = 'friends';
         if ( bp_is_groups_component() && !bp_is_blog_page()  )
             $bp_classes[] = 'groups';
 …
         if ( bp_is_settings_component() && !bp_is_blog_page()  )
             $bp_classes[] = 'settings';
         if ( bp_is_single_item() )
             $bp_classes[] = 'single-item';
         if ( bp_is_messages_inbox() )
             $bp_classes[] = 'inbox';
 …
         if ( bp_is_notices() )
             $bp_classes[] = 'notices';
         if ( bp_is_friend_requests() )
             $bp_classes[] = 'friend-requests';
 …
         if ( bp_is_user_friends() )
             $bp_classes[] = 'my-friends';
         if ( bp_is_create_blog() )
             $bp_classes[] = 'create-blog';
         if ( bp_is_user_recent_commments() )
             $bp_classes[] = 'recent-comments';
         if ( bp_is_user_recent_posts() )
             $bp_classes[] = 'recent-posts';
         if ( bp_is_user_blogs() && !bp_is_directory() )
             $bp_classes[] = 'my-blogs';
         if ( bp_is_user_groups() && !bp_is_directory() )
             $bp_classes[] = 'my-groups';
         if ( bp_is_group_leave() )
             $bp_classes[] = 'leave-group';
         if ( bp_is_group_invites() )
             $bp_classes[] = 'group-invites';
         if ( bp_is_group_members() )
             $bp_classes[] = 'group-members';
         if ( bp_is_group_forum_topic() )
             $bp_classes[] = 'group-forum-topic';
         if ( bp_is_group_forum() )
             $bp_classes[] = 'group-forum';
         if ( bp_is_group_wire() )
             $bp_classes[] = 'group-wire';
         if ( bp_is_group_admin_page() )
             $bp_classes[] = 'group-admin';
         if ( bp_is_group_create() )
             $bp_classes[] = 'group-create';
         if ( bp_is_group_home() )
             $bp_classes[] = 'group-home';
         if ( bp_is_profile_wire() )
             $bp_classes[] = 'profile-wire';
         if ( bp_is_change_avatar() )
             $bp_classes[] = 'change-avatar';
         if ( bp_is_profile_edit() )
             $bp_classes[] = 'profile-edit';
         if ( bp_is_user_friends_activity() )
             $bp_classes[] = 'friends-activity';
         if ( bp_is_user_activity() )
             $bp_classes[] = 'my-activity';
         if ( bp_is_register_page() )
             $bp_classes[] = 'registration';
         if ( bp_is_activation_page() )
             $bp_classes[] = 'activation';
         if ( is_user_logged_in() )
             $bp_classes[] = 'logged-in';
 …
             if ( !empty( $bp->current_component ) )
                 $bp_classes[] = $bp->current_component;
             if ( !empty( $bp->current_action ) )
                 $bp_classes[] = $bp->current_action;
+        }
         /* We don't want WordPress blog classes to appear on non-blog pages. */
         if ( !bp_is_blog_page() || is_home() ) {
 …
                 $wp_classes = array();
+        }
         /* Merge WP classes with BP classes */
         $classes = array_merge( (array) $bp_classes, (array) $wp_classes );
         /* Remove any duplicates */
         $classes = array_unique( $classes );
         return apply_filters( 'bp_get_the_body_class', $classes, $bp_classes, $wp_classes, $custom_classes );
+    }

trunk/bp-core/bp-core-widgets.php

-                      r1926
+                      r2077
         <div class="create-account"><div class="visit generic-button"><a href="<?php bp_signup_page() ?>" title="<?php _e('Create Account', 'buddypress') ?>"><?php _e('Create Account', 'buddypress') ?></a></div></div>
         <?php } ?>
         <?php echo $after_widget; ?>
     <?php
 …
         if ( is_active_widget( false, false, $this->id_base ) )
             wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );
+            wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );
+    }
     function widget($args, $instance) {
         global $bp;
         extract( $args );
         echo $before_widget;
         echo $before_title
            . $widget_name
+           . $widget_name
            . $after_title; ?>
 …
             <div class="item-options" id="members-list-options">
                 <span class="ajax-loader" id="ajax-loader-members"></span>
                 <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="newest-members" class="selected"><?php _e( 'Newest', 'buddypress' ) ?></a> |
                 <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="recently-active-members"><?php _e( 'Active', 'buddypress' ) ?></a> |
+                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="newest-members" class="selected"><?php _e( 'Newest', 'buddypress' ) ?></a> |
+                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="recently-active-members"><?php _e( 'Active', 'buddypress' ) ?></a> |
                 <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="popular-members"><?php _e( 'Popular', 'buddypress' ) ?></a>
             </div>
             <ul id="members-list" class="item-list">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
 …
                 <?php endwhile; ?>
             </ul>
+            </ul>
             <?php wp_nonce_field( 'bp_core_widget_members', '_wpnonce-members' ); ?>
             <input type="hidden" name="members_widget_max" id="members_widget_max" value="<?php echo attribute_escape( $instance['max_members'] ); ?>" />
         <?php else: ?>
 …
         <?php endif; ?>
         <?php echo $after_widget; ?>
     <?php
 …
     function widget($args, $instance) {
         global $bp;
         extract( $args );
         echo $before_widget;
         echo $before_title
            . $widget_name
+           . $widget_name
            . $after_title; ?>
         <?php if ( bp_has_site_members( 'type=online&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
+        <?php if ( bp_has_site_members( 'type=online&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
             <div class="avatar-block">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
 …
                     </div>
                 <?php endwhile; ?>
             </div>
+            </div>
         <?php else: ?>
 …
         <?php endif; ?>
         <?php echo $after_widget; ?>
     <?php
 …
     function widget($args, $instance) {
         global $bp;
         extract( $args );
         echo $before_widget;
         echo $before_title
            . $widget_name
+           . $widget_name
            . $after_title; ?>
         <?php if ( bp_has_site_members( 'type=active&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
+        <?php if ( bp_has_site_members( 'type=active&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
             <div class="avatar-block">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
 …
                     </div>
                 <?php endwhile; ?>
             </div>
+            </div>
         <?php else: ?>
 …
         <?php endif; ?>
         <?php echo $after_widget; ?>
     <?php
 …
     check_ajax_referer('bp_core_widget_members');
     switch ( $_POST['filter'] ) {
         case 'newest-members':
 …
         break;
+    }
     if ( $users['users'] ) {
         echo '0[[SPLIT]]'; // return valid result.
         foreach ( (array) $users['users'] as $user ) {
         ?>
 …
                     <div class="item-meta">
                         <span class="activity">
                             <?php
+                            <?php
                             if ( 'newest-members' == $_POST['filter'] ) {
                                 echo bp_core_get_last_activity( $user->user_registered, __( 'registered %s ago', 'buddypress' ) );
 …
                 </div>
             </li>
             <?php
+            <?php
+        }
     } else {

trunk/bp-core/deprecated/bp-core-deprecated.php

-                      r2070
+                      r2077
+ *
  * This file contains functions that are deprecated.
  * You should not under any circumstance use these functions as they are
+ * You should not under any circumstance use these functions as they are
  * either no longer valid, or have been replaced with something much more awesome.
+ *
 …
  * Of course, things will still work if you use these functions but you will
  * be the laughing stock of the BuddyPress community. We will all point and laugh at
  * you. You'll also be making things harder for yourself in the long run,
+ * you. You'll also be making things harder for yourself in the long run,
  * and you will miss out on lovely performance and functionality improvements.
+ *
+ *
  * If you've checked you are not using any deprecated functions and finished your little
  * dance, you can add the following line to your wp-config.php file to prevent any of
 …
 function bp_core_deprecated_globals() {
     global $bp;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
 …
 function bp_core_signup_show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
     global $current_site;
     ?>
     <h3><?php _e( 'Blog Details', 'buddypress' ) ?></h3>
 …
         <?php _e( "To register your first blog, just fill in the details below and your registration is complete.", 'buddypress' ) ?>
     </p>
     <div id="blog-details-fields">
         <?php
         // Blog name
         if ( 'no' == constant( "VHOST" ) )
 …
             echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
+        }
         if ( !is_user_logged_in() ) {
             echo '<p class="help-text">';
 …
         // Blog Title
         ?>
         <label for="blog_title"><?php _e( 'Blog Title:', 'buddypress' ) ?></label>
+        <label for="blog_title"><?php _e( 'Blog Title:', 'buddypress' ) ?></label>
         <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
             <p class="error"><?php echo $errmsg ?></p>
 …
         <p>
             <label for="blog_public_on"><?php _e( 'Privacy:', 'buddypress' ) ?></label>
             <?php _e( 'I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress' ); ?>
+            <?php _e( 'I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress' ); ?>
             <label class="checkbox" for="blog_public_on">
                 <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
 …
     <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
         <p class="error"><?php echo $errmsg ?></p>
     <?php } ?>
+    <?php } ?>
     <input name="user_email" type="text" id="user_email" value="<?php  echo wp_specialchars($user_email, 1) ?>" maxlength="200" /><p class="help-text"><?php _e( '(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)', 'buddypress' ) ?></p>
     <?php
 …
+    }
     echo '</div>';
     echo '<div id="extra-fields">';
     do_action( 'signup_extra_fields', $errors );
 …
 function bp_core_signup_signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
     global $current_user, $current_site;
     if ( ! is_wp_error($errors) ) {
         $errors = new WP_Error();
 …
     <h3><?php _e( "You're already registered!", 'buddypress' )?></h3>
     <p><?php _e( 'You can still create another blog however. Fill in the form below to add another blog to your account.', 'buddypress' ) ?>
     <p><?php _e( "There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly. If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!", 'buddypress' ) ?></p>
     <form id="setupform" method="post" action="<?php echo site_url(BP_REGISTER_SLUG) ?>">
         <input type="hidden" name="stage" value="gimmeanotherblog" />
 …
     ?>
     <form id="setupform" method="post" action="<?php echo site_url(BP_REGISTER_SLUG) ?>">
         <p id="intro-text"><?php _e( 'Registering for a new account is easy, just fill in the form below and you\'ll be a new member in no time at all.', 'buddypress' ) ?></p>
         <input type="hidden" name="stage" value="validate-user-signup" />
         <?php do_action( "signup_hidden_fields" ); ?>
         <?php bp_core_signup_show_user_form($user_name, $user_email, $errors); ?>
         <?php if( 'blog' == $active_signup ) { ?>
             <input id="signupblog" type="hidden" name="signup_for" value="blog" />
 …
                 <h3><?php _e( 'Create a Blog?', 'buddypress' ) ?></h3>
                 <p id="blog-help-text"><?php _e( 'If you want to create your first blog, select the option below and you\'ll be asked for a few more details.', 'buddypress' ) ?></p>
                 <div id="blog-or-username-fields">
                     <p>
                         <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
                         <label class="checkbox" for="signupblog"><?php _e( 'Gimme a blog!', 'buddypress' ) ?></label>
+                        <label class="checkbox" for="signupblog"><?php _e( 'Gimme a blog!', 'buddypress' ) ?></label>
                     </p>
                     <p>
                         <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
+                        <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
                         <label class="checkbox" for="signupuser"><?php _e( 'Just a username, please.', 'buddypress' ) ?></label>
                     </p>
 …
     ?>
     <h3><?php _e('Congratulations, You are now registered!', 'buddypress' ) ?></h3>
     <p><?php printf( __('But, before you can start using your blog, <strong>you must activate it</strong>. Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.', 'buddypress' ),  $user_email) ?></p>
     <p>&nbsp;</p>
     <h3><?php _e( 'Still waiting for your email?', 'buddypress' ); ?></h3>
     <p>
 …
 function bp_core_activation_set_headers() {
     global $wp_object_cache;
     define( "WP_INSTALLING", true );
     require_once( ABSPATH . WPINC . '/registration.php');
     if( is_object( $wp_object_cache ) )
         $wp_object_cache->cache_enabled = false;
     do_action("activate_header");
+}
 …
 function bp_core_activation_do_activation() {
     global $current_site, $blog_id, $user_id; ?>
     <?php if ( empty( $_GET['key'] ) && empty( $_POST['key'] ) ) { ?>
         <h3><?php _e( 'Activation Key Required', 'buddypress' ) ?></h3>
         <p id="intro-text"><?php _e( 'This is the key contained in the email you were sent after registering for this site.', 'buddypress' ) ?></p>
         <div class="field-box">
             <form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php">
 …
             </form>
         </div>
     <?php } else {
         $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
         $result = wpmu_activate_signup($key);
         if ( is_wp_error($result) ) {
             if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
                 $signup = $result->get_error_data();
                 ?>
                 <h3><?php _e('Your account is now active!', 'buddypress' ); ?></h3>
                 <?php
                 _e( 'Your account has already been activated. You can now log in with the account details that were emailed to you.' );
             } else {
                 ?>
 …
             $user = new WP_User( (int) $user_id);
             ?>
             <h3><?php _e('Your account is now active!', 'buddypress' ); ?></h3>
             <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.', 'buddypress' ), site_url( 'wp-login.php?redirect_to=' . site_url() ), site_url() ); ?></p>
             <div class="field-box" id="signup-welcome">
                 <p><span class="label"><?php _e( 'Username:', 'buddypress' ); ?></span> <?php echo $user->user_login ?></p>
                 <p><span class="label"><?php _e( 'Password:', 'buddypress' ); ?></span> <?php echo $password; ?></p>
             </div>
             <?php
+            <?php
             do_action( 'bp_activation_extras', $user_id, $meta );
+        }
 …
         $activate_url = bp_activation_page( false ) ."?key=$key";
+    }
     $activate_url = clean_url($activate_url);
     $admin_email = get_site_option( "admin_email" );
     if ( empty( $admin_email ) )
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = sprintf(__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) );
     $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path));
     wp_mail($user_email, $subject, $message, $message_headers);
     // Return false to stop the original WPMU function from continuing
     return false;
 …
     // Send email with activation link.
     $admin_email = get_site_option( "admin_email" );
     if ( empty( $admin_email ) )
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
     $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = apply_filters( 'wpmu_signup_user_notification_email', sprintf( __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n", 'buddypress' ), clean_url( bp_activation_page( false ) . "?key=$key" ) ) );
     $subject = apply_filters( 'wpmu_signup_user_notification_subject', sprintf( __(  'Activate %s', 'buddypress' ), $user ) );
+    $subject = apply_filters( 'wpmu_signup_user_notification_subject', sprintf( __(  'Activate %s', 'buddypress' ), $user ) );
     wp_mail( $user_email, $subject, $message, $message_headers );
     // Return false to stop the original WPMU function from continuing
     return false;
 …
 function bp_loggedinuser_avatar( $width = false, $height = false ) {
     global $bp;
     echo apply_filters( 'bp_loggedinuser_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb', 'width' => $width, 'height' => $height ) ) );
+}
 …
 function bp_loggedinuser_avatar_thumbnail( $width = false, $height = false ) {
     global $bp;
     echo apply_filters( 'bp_get_options_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => 'thumb', 'width' => $width, 'height' => $height ) ) );
+}
 …
     <p><?php _e('Your avatar will be used on your profile and throughout the site.', 'buddypress') ?></p>
     <p><?php _e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Photo\' to proceed.', 'buddypress' ) ?></p>
     <form action="" method="post" id="avatar-upload-form" enctype="multipart/form-data">
+    <form action="" method="post" id="avatar-upload-form" enctype="multipart/form-data">
     <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
         <h3><?php _e( 'Your Current Avatar', 'buddypress' ) ?></h3>
         <?php bp_displayed_user_avatar( 'type=full') ?>
         <?php bp_displayed_user_avatar( 'type=thumb' ) ?>
         <p>
             <input type="file" name="file" id="file" />
+            <input type="file" name="file" id="file" />
             <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />
             <input type="hidden" name="action" id="action" value="bp_avatar_upload" />
 …
         <?php wp_nonce_field( 'bp_avatar_upload' ) ?>
     <?php endif; ?>
     <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
         <h3><?php _e( 'Crop Your New Avatar', 'buddypress' ) ?></h3>
         <img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ) ?>" />
         <div id="avatar-crop-pane" style="width:100px;height:100px;overflow:hidden;">
             <img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ) ?>" />
 …
         <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />
         <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />
         <input type="hidden" id="x" name="x" />
 …
         <?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>
     <?php endif; ?>
     </form> <?php
+}
 …
 function bp_core_handle_avatar_upload($file) {
     global $wp_upload_error;
     require_once( ABSPATH . '/wp-admin/includes/file.php' );
     // Change the upload file location to /avatars/user_id
     add_filter( 'upload_dir', 'xprofile_avatar_upload_dir' );
 …
 function bp_core_get_buddypress_themes() {
     global $wp_themes;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     /* Remove the cached WP themes first */
     $wp_existing_themes = &$wp_themes;
     $wp_themes = null;
     add_filter( 'theme_root', 'bp_core_filter_buddypress_theme_root' );
     $themes = get_themes();
     if ( $themes ) {
         foreach ( $themes as $name => $values ) {
             if ( $name == 'BuddyPress Default Home Theme' )
                 continue;
             $member_themes[] = array(
                 'name' => $name,
 …
+        }
+    }
     /* Restore the cached WP themes */
     $wp_themes = $wp_existing_themes;
     return $member_themes;
+}
 …
 function bp_core_force_buddypress_theme( $template ) {
     global $is_member_page, $bp;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $template;
     if ( $is_member_page ) {
         $member_theme = get_site_option( 'active-member-theme' );
         if ( empty( $member_theme ) )
             $member_theme = 'bpmember';
 …
 function bp_core_force_buddypress_stylesheet( $stylesheet ) {
     global $is_member_page;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
 …
     $member_theme = get_site_option( 'active-member-theme' );
     if ( empty( $member_theme ) )
         $member_theme = 'bpmember';
 …
     /* Enqueue the structure CSS file to give basic positional formatting for components */
     wp_enqueue_style( 'bp-core-structure', BP_PLUGIN_URL . '/bp-core/deprecated/css/structure.css' );
+    wp_enqueue_style( 'bp-core-structure', BP_PLUGIN_URL . '/bp-core/deprecated/css/structure.css' );
+}
 add_action( 'bp_styles', 'bp_core_add_structure_css' );
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     // Enable a sitewide CSS file that will apply styles to both the home blog theme
     // and the member theme.
     if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) . '/css/site-wide.css' ) )
         wp_enqueue_style( 'site-wide-styles', WP_CONTENT_URL . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) . '/css/site-wide.css' );
     wp_print_styles();
+}
 …
     if ( defined( 'BP_DISABLE_ADMIN_BAR') )
         return false;
     if ( is_user_logged_in() || ( !(int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
         wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-core/deprecated/css/admin-bar.css' ) );
         if ( 'rtl' == get_bloginfo('text_direction') && file_exists( BP_PLUGIN_DIR . '/bp-core/deprecated/css/admin-bar-rtl.css' ) )
             wp_enqueue_style( 'bp-admin-bar-rtl', BP_PLUGIN_URL . '/bp-core/deprecated/css/admin-bar-rtl.css' );
+            wp_enqueue_style( 'bp-admin-bar-rtl', BP_PLUGIN_URL . '/bp-core/deprecated/css/admin-bar-rtl.css' );
+    }
+}
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $template;
     wp_enqueue_script( 'jquery' );
     wp_enqueue_script( 'jquery-livequery-pack', BP_PLUGIN_URL . '/bp-core/deprecated/js/jquery/jquery.livequery.pack.js', 'jquery' );
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $template;
     wp_enqueue_script( 'bp-core-directory-members', BP_PLUGIN_URL . '/bp-core/deprecated/js/directory-members.js', array( 'jquery', 'jquery-livequery-pack' ) );
+}
 add_action( 'bp_core_action_directory_members', 'bp_core_directory_members_js' );
+add_action( 'bp_core_action_directory_members', 'bp_core_directory_members_js' );
 /*** END DEPRECATED OLD BUDDYPRESS THEME SUPPORT ************/
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     check_ajax_referer('directory_members');
     locate_template( array( 'directories/members/members-loop.php' ), true );
+}
 …
 function bp_login_bar() {
     global $bp;
     if ( !is_user_logged_in() ) : ?>
         <form name="login-form" id="login-form" action="<?php echo $bp->root_domain . '/wp-login.php' ?>" method="post">
             <input type="text" name="log" id="user_login" value="<?php _e( 'Username', 'buddypress' ) ?>" onfocus="if (this.value == '<?php _e( 'Username', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Username', 'buddypress' ) ?>';}" />
             <input type="password" name="pwd" id="user_pass" class="input" value="" />
             <input type="checkbox" name="rememberme" id="rememberme" value="forever" title="<?php _e( 'Remember Me', 'buddypress' ) ?>" />
             <input type="submit" name="wp-submit" id="wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>"/>
+            <input type="submit" name="wp-submit" id="wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>"/>
             <input type="button" name="signup-submit" id="signup-submit" value="<?php _e( 'Sign Up', 'buddypress' ) ?>" onclick="location.href='<?php echo bp_signup_page() ?>'" />
             <input type="hidden" name="redirect_to" value="http://<?php echo $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] ?>" />
             <input type="hidden" name="testcookie" value="1" />
             <?php do_action( 'bp_login_bar_logged_out' ) ?>
         </form>
     <?php else : ?>
         <div id="logout-link">
             <?php bp_loggedinuser_avatar_thumbnail( 20, 20 ) ?> &nbsp;
             <?php bp_loggedinuser_link() ?>
             <?php
+            <?php
                 if ( function_exists('wp_logout_url') ) {
                     $logout_link = '/ <a href="' . wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
                 } else {
                     $logout_link = '/ <a href="' . $bp->root_domain . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
+                }
+                    $logout_link = '/ <a href="' . $bp->root_domain . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a>';
+                }
                 echo apply_filters( 'bp_logout_link', $logout_link );
             ?>
             <?php do_action( 'bp_login_bar_logged_in' ) ?>
         </div>
     <?php endif;
+}
 …
 function bp_core_add_nav_default( $parent_id, $function, $slug = false, $user_has_access = true, $admin_only = false ) {
     global $bp;
     if ( !$user_has_access && !bp_is_home() )
         return false;
     if ( $admin_only && !is_site_admin() )
         return false;
 …
             add_action( 'wp', $function, 3 );
+        }
         if ( $slug )
             $bp->current_action = $slug;
 …
 function bp_get_userbar( $hide_on_directory = true ) {
     global $bp;
     if ( $hide_on_directory && $bp->is_directory )
         return false;
     load_template( TEMPLATEPATH . '/userbar.php' );
+}
 …
 function bp_get_optionsbar( $hide_on_directory = true ) {
     global $bp;
     if ( $hide_on_directory && $bp->is_directory )
         return false;
     load_template( TEMPLATEPATH . '/optionsbar.php' );
+}

trunk/bp-forums.php

-                      r2033
+                      r2077
 if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) )
     define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
 if ( !defined( 'BP_FORUMS_SLUG' ) )
     define( 'BP_FORUMS_SLUG', 'forums' );
 …
     /* For internal identification */
     $bp->forums->id = 'forums';
     $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
     $bp->forums->bbconfig = get_site_option( 'bb-config-location' );
     $bp->forums->slug = BP_FORUMS_SLUG;
     /* Register this in the active components array */
     $bp->active_components[$bp->forums->slug] = $bp->forums->id;
 …
 function bp_forums_is_installed_correctly() {
     global $bp;
     if ( file_exists( $bp->forums->bbconfig ) )
         return true;
     return false;
+}
 …
         if ( (int) get_site_option( 'bp-disable-forum-directory' ) || !function_exists( 'groups_install' ) )
             return false;
         if ( !bp_forums_is_installed_correctly() ) {
             bp_core_add_message( __( 'The forums component has not been set up yet.', 'buddypress' ), 'error' );
             bp_core_redirect( $bp->root_domain );
+        }
         $bp->is_directory = true;
         do_action( 'bbpress_init' );
+        do_action( 'bbpress_init' );
         do_action( 'bp_forums_directory_forums_setup' );
         bp_core_load_template( apply_filters( 'bp_forums_template_directory_forums_setup', 'directories/forums/index' ) );
 …
 function bp_forums_add_admin_menu() {
     global $bp;
     if ( !is_site_admin() )
         return false;
     require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php' );
     /* Add the administration tab under the "Site Admin" tab for site administrators */
     add_submenu_page( 'bp-general-settings', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 'manage_options', 'bb-forums-setup', "bp_forums_bbpress_admin" );
 …
 function bp_forums_new_forum( $args = '' ) {
     do_action( 'bbpress_init' );
     $defaults = array(
         'forum_name' => '',
         'forum_desc' => '',
         'forum_parent_id' => BP_FORUMS_PARENT_FORUM_ID,
         'forum_order' => false,
+    $defaults = array(
+        'forum_name' => '',
+        'forum_desc' => '',
+        'forum_parent_id' => BP_FORUMS_PARENT_FORUM_ID,
+        'forum_order' => false,
         'forum_is_category' => 0
     );
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     return bb_new_forum( array( 'forum_name' => stripslashes( $forum_name ), 'forum_desc' => stripslashes( $forum_desc ), 'forum_parent' => $forum_parent_id, 'forum_order' => $forum_order, 'forum_is_category' => $forum_is_category ) );
+}
 …
 function bp_forums_get_forum_topicpost_count( $forum_id ) {
     global $wpdb, $bbdb;
     do_action( 'bbpress_init' );
 …
 function bp_forums_get_forum_topics( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
+    do_action( 'bbpress_init' );
     $defaults = array(
         'type' => 'newest',
         'forum_id' => false,
         'page' => 1,
         'per_page' => 15,
+        'forum_id' => false,
+        'page' => 1,
+        'per_page' => 15,
         'exclude' => false,
         'show_stickies' => 'all',
         'filter' => false // if $type = tag then filter is the tag name, otherwise it's terms to search on.
     );
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
 …
             $topics = $query->results;
         break;
         case 'popular':
             $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_posts', 'topic_title' => $filter, 'sticky' => $show_stickies ) );
             $topics =& $query->results;
         break;
         case 'unreplied':
             $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'post_count' => 1, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_time', 'topic_title' => $filter, 'sticky' => $show_stickies ) );
             $topics =& $query->results;
         break;
+        break;
         case 'personal':
             $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'per_page' => $per_page, 'page' => $page, 'topic_author_id' => $bp->loggedin_user->id, 'order_by' => 't.topic_time', 'topic_title' => $filter, 'sticky' => $show_stickies ), 'get_recent_user_threads' );
             $topics =& $query->results;
         break;
         case 'tag':
             $query = new BB_Query( 'topic', array( 'forum_id' => $forum_id, 'tag' => $filter, 'per_page' => $per_page, 'page' => $page, 'order_by' => 't.topic_time', 'sticky' => $show_stickies ) );
 …
     do_action( 'bbpress_init' );
     $query = new BB_Query( 'topic', 'topic_id=' . $topic_id . '&page=1' /* Page override so bbPress doesn't use the URI */ );
+    $query = new BB_Query( 'topic', 'topic_id=' . $topic_id . '&page=1' /* Page override so bbPress doesn't use the URI */ );
     return $query->results[0];
 …
 function bp_forums_new_topic( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
+    do_action( 'bbpress_init' );
     $defaults = array(
         'topic_title' => '',
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     if ( empty( $topic_slug ) )
         $topic_slug = sanitize_title( $topic_title );
     if ( !$topic_id = bb_insert_topic( array( 'topic_title' => stripslashes( $topic_title ), 'topic_slug' => $topic_slug, 'topic_poster' => $topic_poster, 'topic_poster_name' => $topic_poster_name, 'topic_last_poster' => $topic_last_poster, 'topic_last_poster_name' => $topic_last_poster_name, 'topic_start_time' => $topic_start_time, 'topic_time' => $topic_time, 'topic_open' => $topic_open, 'forum_id' => (int)$forum_id, 'tags' => $topic_tags ) ) )
         return false;
 …
     if ( !bp_forums_insert_post( array( 'topic_id' => $topic_id, 'post_text' => $topic_text, 'post_time' => $topic_time, 'poster_id' => $topic_poster ) ) )
         return false;
     return $topic_id;
+}
 …
 function bp_forums_update_topic( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
+    do_action( 'bbpress_init' );
     $defaults = array(
         'topic_id' => false,
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     if ( !$topic_id = bb_insert_topic( array( 'topic_id' => $topic_id, 'topic_title' => stripslashes( $topic_title ) ) ) )
         return false;
     if ( !$post = bb_get_first_post( $topic_id ) )
         return false;
 …
     if ( !$post = bb_insert_post( array( 'post_id' => $post->post_id, 'topic_id' => $topic_id, 'post_text' => $topic_text, 'post_time' => $post->post_time, 'poster_id' => $post->poster_id, 'poster_ip' => $post->poster_ip, 'post_status' => $post->post_status, 'post_position' => $post->post_position ) ) )
         return false;
     return bp_forums_get_topic_details( $topic_id );
+}
 …
 function bp_forums_sticky_topic( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
+    do_action( 'bbpress_init' );
     $defaults = array(
         'topic_id' => false,
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     if ( 'stick' == $mode )
         return bb_stick_topic( $topic_id );
 …
 function bp_forums_openclose_topic( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
+    do_action( 'bbpress_init' );
     $defaults = array(
         'topic_id' => false,
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     if ( 'close' == $mode )
         return bb_close_topic( $topic_id );
 …
 function bp_forums_delete_topic( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
+    do_action( 'bbpress_init' );
     $defaults = array(
         'topic_id' => false
 …
+}
 /* Post Functions */
+/* Post Functions */
 function bp_forums_get_topic_posts( $args = '' ) {
     do_action( 'bbpress_init' );
     $defaults = array(
         'topic_id' => false,
+    $defaults = array(
+        'topic_id' => false,
         'page' => 1,
         'per_page' => 15,
 …
 function bp_forums_delete_post( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
+    do_action( 'bbpress_init' );
     $defaults = array(
         'post_id' => false
 …
     extract( $r, EXTR_SKIP );
     return bb_delete_post( $post_id, 1 );
+    return bb_delete_post( $post_id, 1 );
+}
 function bp_forums_insert_post( $args = '' ) {
     global $bp;
     do_action( 'bbpress_init' );
     $defaults = array(
         'post_id' => false,
+    do_action( 'bbpress_init' );
+    $defaults = array(
+        'post_id' => false,
         'topic_id' => false,
         'post_text' => '',
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     if ( !$post = bp_forums_get_post( $post_id ) )
         $post_id = false;
 …
     if ( !isset( $topic_id ) )
         $topic_id = $post->topic_id;
     if ( empty( $post_text ) )
         $post_text = $post->post_text;
     if ( !isset( $post_time ) )
         $post_time = $post->post_time;
 …
 function bp_forums_filter_caps( $allcaps ) {
     global $bp, $wp_roles, $bb_table_prefix;
     $bb_cap = get_usermeta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities' );
     if ( empty( $bb_cap ) )
         return $allcaps;
     $bb_cap = array_keys($bb_cap);
     $bb_cap = $wp_roles->get_role( $bb_cap[0] );
     $bb_cap = $bb_cap->capabilities;
     return array_merge( (array) $allcaps, (array) $bb_cap );
+}

trunk/bp-forums/bp-forums-admin.php

-                      r1960
+                      r2077
 <?php
 function bp_forums_bbpress_admin() {
+function bp_forums_bbpress_admin() {
     global $bp;
 ?>
 …
         <h2><?php _e( 'Forums Setup', 'buddypress' ) ?></h2>
         <?php if ( isset( $_POST['submit'] ) ) : ?>
             <div id="message" class="updated fade">
 …
         <?php
         if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() ) {
             update_site_option( 'bb-config-location', false );
 …
             <p><?php printf( __( 'bbPress forum integration in BuddyPress has been set up correctly. If you are having problems you can <a href="%s" title="Reinstall bbPress">re-install</a>', 'buddypress' ), site_url( 'wp-admin/admin.php?page=bb-forums-setup&reinstall=1' ) ); ?>
             <p><?php _e( 'NOTE: The forums directory will only work if your bbPress tables are in the same database as your WordPress tables. If you are not using an existing bbPress install you can ignore this message.', 'buddypress' ) ?></p>
         <?php
+        <?php
+        }
         ?>
 …
+}
 function bp_forums_bbpress_install_wizard() {
+function bp_forums_bbpress_install_wizard() {
     $post_url = site_url( 'wp-admin/admin.php?page=bb-forums-setup' );
     switch( $_REQUEST['step'] ) {
+    switch( $_REQUEST['step'] ) {
         case 'existing':
             if ( 1 == (int)$_REQUEST['doinstall'] ) {
 …
                         <?php wp_nonce_field( 'bp_forums_existing_install_init' ) ?>
                     </form>
                 <?php
+                <?php
+            }
         break;
         case 'new':
             if ( 1 == (int)$_REQUEST['doinstall'] ) {
                 $result = bp_forums_bbpress_install();
                 switch ( $result ) {
                     case 1:
 …
+            }
         break;
         default:
+        default:
             if ( !file_exists( BP_PLUGIN_DIR . '/bp-forums/bbpress/' ) ) { ?>
                 <div id="message" class="error">
 …
                 </div>
             <?php } else { ?>
                 <p><?php _e( 'Forums in BuddyPress make use of a bbPress installation to function. You can choose to either let BuddyPress set up a new bbPress install, or use an already existing bbPress install. Please choose one of the options below.', 'buddypress' ) ?></p>
                 <a class="button" href="<?php echo $post_url . '&step=new' ?>"><?php _e( 'Set up a new bbPress installation', 'buddypress' ) ?></a> &nbsp;
                 <a class="button" href="<?php echo $post_url . '&step=existing' ?>"><?php _e( 'Use an existing bbPress installation', 'buddypress' ) ?></a>
             <?php }
+            <?php }
         break;
+    }
 …
 function bp_forums_configure_existing_install() {
     global $wpdb, $bbdb;
     check_admin_referer( 'bp_forums_existing_install_init' );
     /* Sanitize $_REQUEST['bbconfigloc'] */
     $_REQUEST['bbconfigloc'] = apply_filters( 'bp_forums_bbconfig_location', $_REQUEST['bbconfigloc'] );
     if ( false === strpos( $_REQUEST['bbconfigloc'], 'bb-config.php' ) ) {
         if ( '/' != substr( $_REQUEST['bbconfigloc'], -1, 1 ) )
             $_REQUEST['bbconfigloc'] .= '/';
         $_REQUEST['bbconfigloc'] .= 'bb-config.php';
+    }
 …
     update_site_option( 'bb-config-location', $_REQUEST['bbconfigloc'] );
     return true;
+}
 …
 function bp_forums_bbpress_install() {
     global $wpdb, $bbdb;
     check_admin_referer( 'bp_forums_new_install_init' );
 …
+        )
     );
     /* Add the custom user and usermeta entries to the config file */
     if ( $initial_write == 1 ) {
 …
     $file = substr( $file, 0, -2 );
     $file .= "\n" .   '$bb->custom_user_table = "' . $wpdb->users . '";';
+    $file .= "\n" .   '$bb->custom_user_table = "' . $wpdb->users . '";';
     $file .= "\n" .   '$bb->custom_user_meta_table = "' . $wpdb->usermeta . '";';
     $file .= "\n\n" . '$bb->uri = "' . BP_PLUGIN_URL . '/bp-forums/bbpress/";';
     $file .= "\n" .   '$bb->name = "' . get_blog_option( BP_ROOT_BLOG, 'name' ) . ' ' . __( 'Forums', 'buddypress' ) . '";';
     $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
     $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . AUTH_SALT . '");';
     $file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', "' . LOGGED_IN_SALT . '");';
     $file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', "' . SECURE_AUTH_SALT . '");';
     $file .= "\n\n" . 'define(\'WP_AUTH_COOKIE_VERSION\', 2);';
+    $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . AUTH_SALT . '");';
+    $file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', "' . LOGGED_IN_SALT . '");';
+    $file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', "' . SECURE_AUTH_SALT . '");';
+    $file .= "\n\n" . 'define(\'WP_AUTH_COOKIE_VERSION\', 2);';
     $file .= "\n\n" . '?>';
     if ( $initial_write == 1 ) {
         $file_handle = fopen( ABSPATH . 'bb-config.php', 'w' );
 …
         return -2;
+    }
     // Get the existing lines in the file
     $lines = file( $file_source );
 …
+        }
+    }
     $writable = true;
     if ( file_exists( $file_target ) ) {

trunk/bp-forums/bp-forums-bbpress.php

-                      r1905
+                      r2077
     global $bb, $bbdb, $bb_table_prefix, $bb_current_user;
     global $bb_roles, $wp_taxonomy_object;
     /* Return if we've already run this function. */
     if ( is_object( $bbdb ) && is_object( $bb_roles ) )
         return;
     if ( !bp_forums_is_installed_correctly() )
         return false;
     define( 'BB_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/' );
     define( 'BACKPRESS_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/bb-includes/backpress/' );
 …
     require_once( BB_PATH . BB_INC . 'class.bb-query.php' );
     require_once( BB_PATH . BB_INC . 'class.bb-walker.php' );
     require_once( BB_PATH . BB_INC . 'functions.bb-core.php' );
     require_once( BB_PATH . BB_INC . 'functions.bb-forums.php' );
 …
     require_once( BB_PATH . BB_INC . 'functions.bb-formatting.php' );
     require_once( BB_PATH . BB_INC . 'functions.bb-template.php' );
     require_once( BACKPRESS_PATH . 'class.wp-taxonomy.php' );
     require_once( BB_PATH . BB_INC . 'class.bb-taxonomy.php' );
     $bb = new stdClass();
     require_once( $bp->forums->bbconfig );
 …
     // Setup the global database connection
     $bbdb = new BPDB ( BBDB_USER, BBDB_PASSWORD, BBDB_NAME, BBDB_HOST );
     /* Set the table names */
     $bbdb->forums = $bb_table_prefix . 'forums';
 …
     $bbdb->term_taxonomy = $bb_table_prefix . 'term_taxonomy';
     $bbdb->topics = $bb_table_prefix . 'topics';
     if ( isset( $bb->custom_user_table ) )
         $bbdb->users = $bb->custom_user_table;
     else
         $bbdb->users = $wpdb->users;
     if ( isset( $bb->custom_user_meta_table ) )
         $bbdb->usermeta = $bb->custom_user_meta_table;
     else
         $bbdb->usermeta = $wpdb->usermeta;
     $bbdb->prefix = $bb_table_prefix;
 …
     if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) )
         require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
     if ( is_object( $wp_roles ) ) {
         $bb_roles =& $wp_roles;
 …
     if ( !isset( $wp_taxonomy_object ) )
         $wp_taxonomy_object = new BB_Taxonomy( $bbdb );
     $wp_taxonomy_object->register_taxonomy( 'bb_topic_tag', 'bb_topic' );
 …
         dbDelta( $bb_queries );
         require_once( BB_PATH . 'bb-admin/includes/functions.bb-upgrade.php' );
         bb_update_db_version();
         /* Set the site admins as the keymasters */
         $site_admins = get_site_option( 'site_admins', array('admin') );
 …
         // Create the first forum.
         bb_new_forum( array( 'forum_name' => 'Default Forum' ) );
         // Set the site URI
         bb_update_option( 'uri', BB_URL );
 …
         $args = wp_parse_args( $args, $defaults );
         extract( $args, EXTR_SKIP );
         return update_usermeta( $id, $meta_key, $meta_value );
+    }

trunk/bp-forums/bp-forums-filters.php

-                      r2019
+                      r2077
     $allowedtags['p'] = array();
     $allowedtags['br'] = array();
     return $allowedtags;
+}
 …
 function bp_forums_filter_tag_link( $link, $tag, $page, $context ) {
     global $bp;
     return apply_filters( 'bp_forums_filter_tag_link', $bp->root_domain . '/' . $bp->forums->slug . '/tag/' . $tag . '/' );
+}

trunk/bp-forums/bp-forums-templatetags.php

-                      r2012
+                      r2077
     var $topics;
     var $topic;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_topic_count;
     var $single_topic = false;
     var $sort_by;
     var $order;
     function BP_Forums_Template_Forum( $type, $forum_id, $per_page, $max, $no_stickies, $filter ) {
         global $bp;
 …
         $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : 1;
         $this->pag_num = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
         /* Only show stickies if we are viewing a single group forum, otherwise we could end up with hundreds globally */
         if ( $no_stickies )
 …
                 $this->topics = bp_forums_get_forum_topics( array( 'forum_id' => $forum_id, 'filter' => $filter, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
             case 'popular':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'popular', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
             case 'unreplied':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'unreplied', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
             case 'personal':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'personal', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
             case 'tag':
                 $this->topics = bp_forums_get_forum_topics( array( 'type' => 'tag', 'filter' => $filter, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $show_stickies ) );
                 break;
+                break;
+        }
         $this->topics = apply_filters( 'bp_forums_template_topics', $this->topics, $type, $forum_id, $per_page, $max, $no_stickies );
         if ( !(int)$this->topics ) {
             $this->topic_count = 0;
 …
                 $topic_count = (int)groups_total_public_forum_topic_count( $type );
             } else {
                 $topic_count = count( $this->topics );
+                $topic_count = count( $this->topics );
+            }
             if ( !$max || $max >= $topic_count )
                 $this->total_topic_count = $topic_count;
 …
             } else {
                 $this->topic_count = count( $this->topics );
+            }
+            }
+        }
 …
                     $stickies[] = $topic;
                 else
                     $standard[] = $topic;
+                    $standard[] = $topic;
+            }
             $this->topics = array_merge( (array)$stickies, (array)$standard );
 …
         ));
+    }
     function has_topics() {
         if ( $this->topic_count )
             return true;
         return false;
+    }
     function next_topic() {
         $this->current_topic++;
         $this->topic = $this->topics[$this->current_topic];
         return $this->topic;
+    }
     function rewind_topics() {
         $this->current_topic = -1;
 …
+        }
+    }
     function user_topics() {
+    function user_topics() {
         if ( $this->current_topic + 1 < $this->topic_count ) {
             return true;
 …
         return false;
+    }
     function the_topic() {
         global $topic;
 …
         $this->topic = $this->next_topic();
         $this->topic = (object)$this->topic;
         if ( $this->current_topic == 0 ) // loop has just started
             do_action('loop_start');
 …
 function bp_has_forum_topics( $args = '' ) {
     global $forum_template, $bp;
     $defaults = array(
         'type' => 'newest',
 …
             return false;
+    }
     /* If we're viewing a tag in the directory, let's auto set the filter to the tag name */
     if ( $bp->is_directory && 'tag' == $type && !empty( $bp->action_variables[0] ) )
 …
     if ( $bp->is_directory && !empty( $_GET['fs'] ) )
         $filter = $_GET['fs'];
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $per_page, $max, $no_stickies, $filter );
     return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
+    return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
+}
     /* DEPRECATED use bp_has_forum_topics() */
 …
         return apply_filters( 'bp_get_the_topic_id', $forum_template->topic->topic_id );
+    }
 function bp_the_topic_title() {
     echo bp_get_the_topic_title();
 …
     function bp_get_the_topic_poster_avatar( $args = '' ) {
         global $forum_template;
         $defaults = array(
             'type' => 'thumb',
 …
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_the_topic_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+        return apply_filters( 'bp_get_the_topic_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+    }
 …
         return apply_filters( 'bp_get_the_topic_poster_name', bp_core_get_userlink( $forum_template->topic->topic_poster ) );
+    }
 function bp_the_topic_object_id() {
     echo bp_get_the_topic_object_id();
 …
         return apply_filters( 'bp_get_the_topic_object_id', $forum_template->topic->object_id );
+    }
 function bp_the_topic_object_name() {
     echo bp_get_the_topic_object_name();
 …
         return apply_filters( 'bp_get_the_topic_object_name', $forum_template->topic->object_name );
+    }
 function bp_the_topic_object_slug() {
     echo bp_get_the_topic_object_slug();
 …
         return apply_filters( 'bp_get_the_topic_object_slug', $forum_template->topic->object_slug );
+    }
 function bp_the_topic_object_permalink() {
     echo bp_get_the_topic_object_permalink();
 …
     function bp_get_the_topic_object_permalink() {
         global $bp, $forum_template;
         /* Currently this will only work with group forums, extended support in the future */
         return apply_filters( 'bp_get_the_topic_object_permalink', $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/forum/' );
+    }
 function bp_the_topic_last_poster_name() {
     echo bp_get_the_topic_last_poster_name();
 …
         return apply_filters( 'bp_get_the_topic_last_poster_name', bp_core_get_userlink( $forum_template->topic->topic_last_poster ) );
+    }
 function bp_the_topic_object_avatar( $args = '' ) {
     echo bp_get_the_topic_object_avatar( $args );
 …
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_the_topic_object_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->object_id, 'type' => $type, 'object' => 'group', 'width' => $width, 'height' => $height ) ) );
+    }
+        return apply_filters( 'bp_get_the_topic_object_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->object_id, 'type' => $type, 'object' => 'group', 'width' => $width, 'height' => $height ) ) );
+    }
 function bp_the_topic_last_poster_avatar( $args = '' ) {
     echo bp_get_the_topic_last_poster_avatar( $args );
 …
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_last_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+        return apply_filters( 'bp_get_the_topic_last_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->topic_last_poster, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+    }
 …
         return apply_filters( 'bp_get_the_topic_start_time', $forum_template->topic->topic_start_time );
+    }
 function bp_the_topic_time() {
     echo bp_get_the_topic_time();
 …
             return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d post', 'buddypress' ), $forum_template->topic->topic_posts ) );
         else
             return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d posts', 'buddypress' ), $forum_template->topic->topic_posts ) );
+    }
+            return apply_filters( 'bp_get_the_topic_total_post_count', sprintf( __( '%d posts', 'buddypress' ), $forum_template->topic->topic_posts ) );
+    }
 function bp_the_topic_total_posts() {
     echo bp_get_the_topic_total_posts();
 …
     function bp_get_the_topic_total_posts() {
         global $forum_template;
         return $forum_template->topic->topic_posts;
+    }
 function bp_the_topic_tag_count() {
     echo bp_get_the_topic_tag_count();
 …
     function bp_get_the_topic_permalink() {
         global $forum_template, $bp;
         if ( $forum_template->topic->object_slug )
             $permalink = $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/';
 …
         else
             $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_action . '/';
         return apply_filters( 'bp_get_the_topic_permalink', $permalink . 'forum/topic/' . $forum_template->topic->topic_slug . '/' );
+    }
 …
         return apply_filters( 'bp_get_the_topic_time_since_created', bp_core_time_since( strtotime( $forum_template->topic->topic_start_time ) ) );
+    }
 function bp_the_topic_latest_post_excerpt( $args = '' ) {
     echo bp_get_the_topic_latest_post_excerpt( $args );
 …
 function bp_the_topic_time_since_last_post( $deprecated = true ) {
     global $forum_template;
     if ( !$deprecated )
         return bp_get_the_topic_time_since_last_post();
 …
     function bp_get_the_topic_is_mine() {
         global $bp, $forum_template;
         return $bp->loggedin_user->id == $forum_template->topic->topic_poster;
+    }
 …
+}
     function bp_get_the_topic_admin_links( $args = '' ) {
         global $bp, $forum_template;
+        global $bp, $forum_template;
         $defaults = array(
             'seperator' => '|'
 …
         $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit', 'buddypress' ) . '</a>';
         if ( $bp->is_item_admin || $bp->is_item_mod || is_site_admin() ) {
             if ( 0 == (int)$forum_template->topic->topic_sticky )
 …
             $links[] = '<a class="confirm" id="topic-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'delete', 'bp_forums_delete_topic' ) . '">' . __( 'Delete', 'buddypress' ) . '</a>';
+        }
         return implode( ' ' . $seperator . ' ', (array) $links );
+    }
 …
     function bp_get_the_topic_css_class() {
         global $forum_template;
         $class = false;
         if ( $forum_template->current_topic % 2 == 1 )
             $class .= 'alt';
         if ( 1 == (int)$forum_template->topic->topic_sticky )
             $class .= ' sticky';
         if ( 0 == (int)$forum_template->topic->topic_open )
             $class .= ' closed';
         return trim( $class );
+    }
 …
     function bp_get_my_forum_topics_link() {
         global $bp;
         return apply_filters( 'bp_get_my_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/personal/' );
+    }
 …
     function bp_get_unreplied_forum_topics_link() {
         global $bp;
         return apply_filters( 'bp_get_unreplied_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/unreplied/' );
+    }
 …
     function bp_get_popular_forum_topics_link() {
         global $bp;
         return apply_filters( 'bp_get_popular_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/popular/' );
+    }
 …
     function bp_get_newest_forum_topics_link() {
         global $bp;
         return apply_filters( 'bp_get_newest_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/' );
+    }
 …
     function bp_get_forum_topic_type() {
         global $bp;
         if ( !$bp->is_directory || !$bp->current_action )
             return 'newest';
         return apply_filters( 'bp_get_forum_topic_type', $bp->current_action );
+    }
 function bp_forums_tag_name() {
     echo bp_get_forums_tag_name();
 …
     function bp_get_forums_tag_name() {
         global $bp;
         if ( $bp->is_directory && $bp->forums->slug == $bp->current_component )
             return apply_filters( 'bp_get_forums_tag_name', $bp->action_variables[0] );
+            return apply_filters( 'bp_get_forums_tag_name', $bp->action_variables[0] );
+    }
 …
 function bp_forum_pagination_count() {
     global $bp, $forum_template;
     $from_num = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
     $to_num = ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 );
+    $to_num = ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 );
     echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %d to %d (%d total topics)', 'buddypress' ), $from_num, $to_num, $forum_template->total_topic_count ) );
 ?>
 …
 function bp_is_edit_topic() {
     global $bp;
     if ( in_array( 'post', (array)$bp->action_variables ) && in_array( 'edit', (array)$bp->action_variables ) )
         return false;
     return true;
+}
 …
     var $posts;
     var $post;
     var $topic_id;
     var $topic;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_post_count;
     var $single_post = false;
     var $sort_by;
     var $order;
     function BP_Forums_Template_Topic( $topic_id, $per_page, $max ) {
         global $bp, $current_user, $forum_template;
         $this->pag_page = isset( $_REQUEST['topic_page'] ) ? intval( $_REQUEST['topic_page'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
         $this->topic_id = $topic_id;
         $forum_template->topic = (object) bp_forums_get_topic_details( $this->topic_id );
         $this->posts = bp_forums_get_topic_posts( array( 'topic_id' => $this->topic_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num ) );
         if ( !$this->posts ) {
             $this->post_count = 0;
 …
         ));
+    }
     function has_posts() {
         if ( $this->post_count )
             return true;
         return false;
+    }
     function next_post() {
         $this->current_post++;
         $this->post = $this->posts[$this->current_post];
         return $this->post;
+    }
     function rewind_posts() {
         $this->current_post = -1;
 …
+        }
+    }
     function user_posts() {
+    function user_posts() {
         if ( $this->current_post + 1 < $this->post_count ) {
             return true;
 …
         return false;
+    }
     function the_post() {
         global $post;
 …
         $this->post = $this->next_post();
         $this->post = (object)$this->post;
         if ( $this->current_post == 0 ) // loop has just started
             do_action('loop_start');
 …
 function bp_has_forum_topic_posts( $args = '' ) {
     global $topic_template, $bp;
     $defaults = array(
         'topic_id' => false,
 …
     function bp_get_the_topic_post_id() {
         global $topic_template;
         return apply_filters( 'bp_get_the_topic_post_id', $topic_template->post->post_id );
+    }
 …
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_the_topic_post_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $topic_template->post->poster_id, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+        return apply_filters( 'bp_get_the_topic_post_poster_avatar', bp_core_fetch_avatar( array( 'item_id' => $topic_template->post->poster_id, 'type' => $type, 'width' => $width, 'height' => $height ) ) );
+    }
 …
         global $topic_template;
         return apply_filters( 'bp_get_the_topic_post_poster_name', bp_core_get_userlink( $topic_template->post->poster_id ) );
+        return apply_filters( 'bp_get_the_topic_post_poster_name', bp_core_get_userlink( $topic_template->post->poster_id ) );
+    }
 …
     function bp_get_the_topic_post_is_mine() {
         global $bp, $topic_template;
         return $bp->loggedin_user->id == $topic_template->post->poster_id;
+    }
 …
+}
     function bp_get_the_topic_post_admin_links( $args = '' ) {
         global $topic_template;
+        global $topic_template;
         /* Never show for the first post in a topic. */
         if ( 0 == $topic_template->current_post )
             return;
         $defaults = array(
             'seperator' => '|'
 …
     function bp_get_the_topic_post_edit_text() {
         global $bp;
         $post = bp_forums_get_post( $bp->action_variables[4] );
         return attribute_escape( $post->post_text );
 …
 function bp_the_topic_pagination_count() {
     global $bp, $topic_template;
     $from_num = intval( ( $topic_template->pag_page - 1 ) * $topic_template->pag_num ) + 1;
     $to_num = ( $from_num + ( $topic_template->pag_num - 1  ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $from_num + ( $topic_template->pag_num - 1 );
+    $to_num = ( $from_num + ( $topic_template->pag_num - 1  ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $from_num + ( $topic_template->pag_num - 1 );
     echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $topic_template->total_post_count ) );
 ?>
 …
     function bp_get_forum_permalink() {
         global $bp;
         if ( $bp->is_single_item )
             $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/';
 …
     function bp_get_forum_directory_permalink() {
         global $bp;
         return apply_filters( 'bp_get_forum_directory_permalink', $bp->root_domain . '/' . $bp->forums->slug );
+    }
 function bp_forums_tag_heat_map( $args = '' ) {
+function bp_forums_tag_heat_map( $args = '' ) {
     $defaults = array(
         'smallest' => '10',
 …
         global $topic_template;
         return apply_filters( 'bp_get_forum_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
+        return apply_filters( 'bp_get_forum_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
+    }
 …
     function bp_get_forum_topic_action() {
         global $bp;
         return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
+        return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
+    }

trunk/bp-friends.php

-                      r1995
+                      r2077
 function friends_install() {
     global $wpdb, $bp;
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     $sql[] = "CREATE TABLE {$bp->friends->table_name} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
     require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
     dbDelta($sql);
     update_site_option( 'bp-friends-db-version', BP_FRIENDS_DB_VERSION );
+}
 …
     /* For internal identification */
     $bp->friends->id = 'friends';
     $bp->friends->table_name = $wpdb->base_prefix . 'bp_friends';
     $bp->friends->format_notification_function = 'friends_format_notifications';
     $bp->friends->slug = BP_FRIENDS_SLUG;
     /* Register this in the active components array */
     $bp->active_components[$bp->friends->slug] = $bp->friends->id;
 …
     do_action( 'friends_setup_globals' );
+}
 add_action( 'plugins_loaded', 'friends_setup_globals', 5 );
+add_action( 'plugins_loaded', 'friends_setup_globals', 5 );
 add_action( 'admin_menu', 'friends_setup_globals', 2 );
 function friends_check_installed() {
+function friends_check_installed() {
     global $wpdb, $bp;
     if ( !is_site_admin() )
         return false;
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
     if ( get_site_option('bp-friends-db-version') < BP_FRIENDS_DB_VERSION )
 …
 function friends_setup_nav() {
     global $bp;
     /* Add 'Friends' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __('Friends', 'buddypress'), 'slug' => $bp->friends->slug, 'position' => 60, 'screen_function' => 'friends_screen_my_friends', 'default_subnav_slug' => 'my-friends', 'item_css_id' => $bp->friends->id ) );
     $friends_link = $bp->loggedin_user->domain . $bp->friends->slug . '/';
     /* Add the subnav items to the friends nav item */
     bp_core_new_subnav_item( array( 'name' => __( 'My Friends', 'buddypress' ), 'slug' => 'my-friends', 'parent_url' => $friends_link, 'parent_slug' => $bp->friends->slug, 'screen_function' => 'friends_screen_my_friends', 'position' => 10, 'item_css_id' => 'friends-my-friends' ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Requests', 'buddypress' ), 'slug' => 'requests', 'parent_url' => $friends_link, 'parent_slug' => $bp->friends->slug, 'screen_function' => 'friends_screen_requests', 'position' => 20, 'user_has_access' => bp_is_home() ) );
     if ( $bp->current_component == $bp->friends->slug ) {
         if ( bp_is_home() ) {
 …
         } else {
             $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
             $bp->bp_options_title = $bp->displayed_user->fullname;
+            $bp->bp_options_title = $bp->displayed_user->fullname;
+        }
+    }
     do_action( 'friends_setup_nav' );
+}
 …
     do_action( 'friends_screen_my_friends' );
     bp_core_load_template( apply_filters( 'friends_template_my_friends', 'friends/index' ) );
+    bp_core_load_template( apply_filters( 'friends_template_my_friends', 'friends/index' ) );
+}
 function friends_screen_requests() {
     global $bp;
     if ( isset($bp->action_variables) && 'accept' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
         /* Check the nonce */
         if ( !check_admin_referer( 'friends_accept_friendship' ) )
+        if ( !check_admin_referer( 'friends_accept_friendship' ) )
             return false;
         if ( friends_accept_friendship( $bp->action_variables[1] ) ) {
             bp_core_add_message( __( 'Friendship accepted', 'buddypress' ) );
 …
+        }
         bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
     } else if ( isset($bp->action_variables) && 'reject' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
         /* Check the nonce */
         if ( !check_admin_referer( 'friends_reject_friendship' ) )
             return false;
+        if ( !check_admin_referer( 'friends_reject_friendship' ) )
+            return false;
         if ( friends_reject_friendship( $bp->action_variables[1] ) ) {
             bp_core_add_message( __( 'Friendship rejected', 'buddypress' ) );
         } else {
             bp_core_add_message( __( 'Friendship could not be rejected', 'buddypress' ), 'error' );
+        }
+        }
         bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
+    }
     do_action( 'friends_screen_requests' );
     bp_core_load_template( apply_filters( 'friends_template_requests', 'friends/requests' ) );
+}
 …
+}
 function friends_screen_notification_settings() {
+function friends_screen_notification_settings() {
     global $current_user; ?>
     <table class="notification-settings" id="friends-notification-settings">
 …
             <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
         <?php do_action( 'friends_screen_notification_settings' ); ?>
     </table>
 <?php
+<?php
+}
 add_action( 'bp_notification_settings', 'friends_screen_notification_settings' );
 …
     if ( $bp->current_component != $bp->friends->slug || $bp->current_action != 'add-friend' )
         return false;
     $potential_friend_id = $bp->action_variables[0];
 …
     if ( $potential_friend_id == $bp->loggedin_user->id )
         return false;
     $friendship_status = BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $potential_friend_id );
     if ( 'not_friends' == $friendship_status ) {
         if ( !check_admin_referer( 'friends_add_friend' ) )
             return false;
         if ( !friends_add_friend( $bp->loggedin_user->id, $potential_friend_id ) ) {
             bp_core_add_message( __( 'Friendship could not be requested.', 'buddypress' ), 'error' );
 …
+        }
     } else if ( 'is_friend' == $friendship_status ) {
         bp_core_add_message( __( 'You are already friends with this user', 'buddypress' ), 'error' );
+        bp_core_add_message( __( 'You are already friends with this user', 'buddypress' ), 'error' );
     } else {
         bp_core_add_message( __( 'You already have a pending friendship request with this user', 'buddypress' ), 'error' );
+    }
+        bp_core_add_message( __( 'You already have a pending friendship request with this user', 'buddypress' ), 'error' );
+    }
     bp_core_redirect( wp_get_referer() );
     return false;
+}
 …
 function friends_action_remove_friend() {
     global $bp;
     if ( $bp->current_component != $bp->friends->slug || $bp->current_action != 'remove-friend' )
         return false;
     $potential_friend_id = $bp->action_variables[0];
 …
     if ( $potential_friend_id == $bp->loggedin_user->id )
         return false;
     $friendship_status = BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $potential_friend_id );
     if ( 'is_friend' == $friendship_status ) {
         if ( !check_admin_referer( 'friends_remove_friend' ) )
             return false;
         if ( !friends_remove_friend( $bp->loggedin_user->id, $potential_friend_id ) ) {
             bp_core_add_message( __( 'Friendship could not be canceled.', 'buddypress' ), 'error' );
 …
+        }
     } else if ( 'is_friends' == $friendship_status ) {
         bp_core_add_message( __( 'You are not yet friends with this user', 'buddypress' ), 'error' );
+        bp_core_add_message( __( 'You are not yet friends with this user', 'buddypress' ), 'error' );
     } else {
         bp_core_add_message( __( 'You have a pending friendship request with this user', 'buddypress' ), 'error' );
+    }
+        bp_core_add_message( __( 'You have a pending friendship request with this user', 'buddypress' ), 'error' );
+    }
     bp_core_redirect( wp_get_referer() );
     return false;
+}
 …
 function friends_record_activity( $args = '' ) {
     global $bp;
     if ( !function_exists( 'bp_activity_add' ) )
         return false;
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
+    extract( $r, EXTR_SKIP );
     return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 …
 function friends_register_activity_actions() {
     global $bp;
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
 …
 function friends_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
     global $bp;
     switch ( $action ) {
         case 'friendship_accepted':
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_friends_multiple_friendship_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/my-friends/newest" title="' . __( 'My Friends', 'buddypress' ) . '">' . sprintf( __('%d friends accepted your friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', (int)$total_items );
+                return apply_filters( 'bp_friends_multiple_friendship_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/my-friends/newest" title="' . __( 'My Friends', 'buddypress' ) . '">' . sprintf( __('%d friends accepted your friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', (int)$total_items );
             } else {
                 $user_fullname = bp_core_get_user_displayname( $item_id );
                 $user_url = bp_core_get_userurl( $item_id );
                 return apply_filters( 'bp_friends_single_friendship_accepted_notification', '<a href="' . $user_url . '?new" title="' . $user_fullname .'\'s profile">' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
+            }
+            }
         break;
         case 'friendship_request':
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_friends_multiple_friendship_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have %d pending friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                return apply_filters( 'bp_friends_multiple_friendship_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have %d pending friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
             } else {
                 $user_fullname = bp_core_get_user_displayname( $item_id );
                 $user_url = bp_core_get_userurl( $item_id );
                 return apply_filters( 'bp_friends_single_friendship_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have a friendship request from %s', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
+            }
+            }
         break;
+    }
     do_action( 'friends_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
     return false;
+}
 …
     if ( empty( $friend_count ) )
         return false;
     if ( !(int)$friend_count )
         return false;
     return true;
+}
 …
 function friends_get_friendship_requests( $user_id ) {
     $fship_ids = friends_get_friendship_ids( $user_id, true );
     return array( 'requests' => $fship_ids, 'total' => count($fship_ids) );
+}
 …
     else
         $friend_ids = friends_get_friend_user_ids( $user_id );
     if ( !$friend_ids )
         return false;
     if ( $filter )
         $friend_ids = $friend_ids['friends'];
     $ids_and_activity = friends_get_bulk_last_active( implode( ',', (array)$friend_ids ) );
     if ( !$ids_and_activity )
         return false;
     $total_friends = count( $ids_and_activity );
     if ( $pag_num && $pag_page )
         return array( 'friends' => array_slice( $ids_and_activity, intval( ( $pag_page - 1 ) * $pag_num), intval( $pag_num ) ), 'total' => $total_friends );
 …
     else
         $friend_ids = friends_get_friend_user_ids( $user_id );
     if ( !$friend_ids )
         return false;
     if ( $filter )
         $friend_ids = $friend_ids['friends'];
     $sorted_ids = BP_Friends_Friendship::sort_by_name( implode( ',', $friend_ids ) );
     if ( !$sorted_ids )
         return false;
     $total_friends = count( $sorted_ids );
     if ( $pag_num && $pag_page )
         return array( 'friends' => array_slice( $sorted_ids, intval( ( $pag_page - 1 ) * $pag_num), intval( $pag_num ) ), 'total' => $total_friends );
 …
     else
         $friend_ids = friends_get_friend_user_ids( $user_id );
     if ( !$friend_ids )
         return false;
+        return false;
     if ( $filter )
 …
     $total_friends = count( $friend_ids );
     if ( $pag_num && $pag_page )
         return array( 'friends' => array_slice( $friend_ids, intval( ( $pag_page - 1 ) * $pag_num), intval( $pag_num ) ), 'total' => $total_friends );
+        return array( 'friends' => array_slice( $friend_ids, intval( ( $pag_page - 1 ) * $pag_num), intval( $pag_num ) ), 'total' => $total_friends );
     else
         return array( 'friends' => $friend_ids, 'total' => $total_friends );
+}
+        return array( 'friends' => $friend_ids, 'total' => $total_friends );
+}
 function friends_get_bulk_last_active( $friend_ids ) {
     return BP_Friends_Friendship::get_bulk_last_active( $friend_ids );
 …
 function friends_get_friends_list( $user_id ) {
     global $bp;
     $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
 …
         if ( function_exists('bp_user_fullname') )
             $display_name = bp_core_get_user_displayname( $friend_ids[$i] );
         if ( $display_name != ' ' ) {
             $friends[] = array(
 …
+        }
+    }
     if ( $friends && is_array($friends) )
         usort($friends, 'friends_sort_by_name');
 …
+}
     function friends_sort_by_name($a, $b) {
+    function friends_sort_by_name($a, $b) {
         return strcasecmp($a['full_name'], $b['full_name']);
+    }
 …
 function friends_get_friends_invite_list( $user_id = false, $group_id ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     $friend_ids = friends_get_alphabetically( $user_id );
 …
         if ( groups_check_user_has_invite( $friend_ids['friends'][$i]->user_id, $group_id ) || groups_is_user_member( $friend_ids['friends'][$i]->user_id, $group_id ) )
             continue;
         $display_name = bp_core_get_user_displayname( $friend_ids['friends'][$i]->user_id );
         if ( $display_name != ' ' ) {
             $friends[] = array(
 …
     $user_ids = BP_Friends_Friendship::search_users( $search_terms, $user_id, $pag_num, $pag_page );
     if ( !$user_ids )
         return false;
 …
         $users[] = new BP_Core_User($user_ids[$i]);
+    }
     return array( 'users' => $users, 'count' => BP_Friends_Friendship::search_users_count($search_terms) );
+}
 …
     if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id ) )
         return true;
     return false;
+}
 …
 function friends_add_friend( $initiator_userid, $friend_userid, $force_accept = false ) {
     global $bp;
     $friendship = new BP_Friends_Friendship;
     if ( (int)$friendship->is_confirmed )
         return true;
     $friendship->initiator_user_id = $initiator_userid;
     $friendship->friend_user_id = $friend_userid;
 …
     $friendship->is_limited = 0;
     $friendship->date_created = time();
     if ( $force_accept )
         $friendship->is_confirmed = 1;
     if ( $friendship->save() ) {
         if ( !$force_accept ) {
             // Add the on screen notification
             bp_core_add_notification( $friendship->initiator_user_id, $friendship->friend_user_id, 'friends', 'friendship_request' );
+            bp_core_add_notification( $friendship->initiator_user_id, $friendship->friend_user_id, 'friends', 'friendship_request' );
             // Send the email notification
             require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' );
             friends_notification_new_request( $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
             do_action( 'friends_friendship_requested', $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
+            do_action( 'friends_friendship_requested', $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
         } else {
             do_action( 'friends_friendship_accepted', $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
+        }
         return true;
+    }
     return false;
+}
 …
 function friends_remove_friend( $initiator_userid, $friend_userid ) {
     global $bp;
     $friendship_id = BP_Friends_Friendship::get_friendship_id( $initiator_userid, $friend_userid );
     $friendship = new BP_Friends_Friendship( $friendship_id );
     // Remove the activity stream item for the user who canceled the friendship
     friends_delete_activity( array( 'item_id' => $friendship_id, 'component_action' => 'friendship_accepted', 'user_id' => $bp->displayed_user->id ) );
     do_action( 'friends_friendship_deleted', $friendship_id, $initiator_userid, $friend_userid );
     if ( $friendship->delete() ) {
         friends_update_friend_totals( $initiator_userid, $friend_userid, 'remove' );
         return true;
+    }
     return false;
+}
 …
 function friends_accept_friendship( $friendship_id ) {
     global $bp;
     $friendship = new BP_Friends_Friendship( $friendship_id, true, false );
     if ( !$friendship->is_confirmed && BP_Friends_Friendship::accept( $friendship_id ) ) {
         friends_update_friend_totals( $friendship->initiator_user_id, $friendship->friend_user_id );
         /* Remove the friend request notice */
         bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_request' );
+        bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_request' );
         /* Add a friend accepted notice for the initiating user */
         bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_accepted' );
         $initiator_link = bp_core_get_userlink( $friendship->initiator_user_id );
         $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
         $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userlink( $friendship->initiator_user_id ), &$friendship );
         /* Record in activity streams for the initiator */
         friends_record_activity( array(
+        friends_record_activity( array(
             'user_id' => $friendship->initiator_user_id,
             'component_action' => 'friendship_created',
 …
         /* Record in activity streams for the friend */
         friends_record_activity( array(
+        friends_record_activity( array(
             'user_id' => $friendship->friend_user_id,
             'component_action' => 'friendship_created',
 …
             'hide_sitewide' => true /* We've already got the first entry site wide */
         ) );
         /* Send the email notification */
         require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' );
 …
         do_action( 'friends_friendship_accepted', $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
         return true;
+    }
     return false;
+}
 function friends_reject_friendship( $friendship_id ) {
+function friends_reject_friendship( $friendship_id ) {
     $friendship = new BP_Friends_Friendship( $friendship_id, true, false );
     if ( !$friendship->is_confirmed && BP_Friends_Friendship::reject( $friendship_id ) ) {
         // Remove the friend request notice
         bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_request' );
+        bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_request' );
         do_action( 'friends_friendship_rejected', $friendship_id, &$friendship );
         return true;
+    }
     return false;
+}
 …
     } else {
         update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) - 1 );
         update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) - 1 );
+        update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) - 1 );
+    }
+}
 …
 function friends_remove_data( $user_id ) {
     BP_Friends_Friendship::delete_all_for_user($user_id);
     /* Remove usermeta */
     delete_usermeta( $user_id, 'total_friend_count' );
     /* Remove friendship requests FROM user */
     bp_core_delete_notifications_from_user( $user_id, $bp->friends->slug, 'friendship_request' );

trunk/bp-friends/bp-friends-classes.php

-                      r2055
+                      r2077
     var $is_limited;
     var $date_created;
     var $is_request;
     var $populate_friend_details;
     var $friend;
     function bp_friends_friendship( $id = null, $is_request = false, $populate_friend_details = true ) {
         $this->is_request = $is_request;
         if ( $id ) {
             $this->id = $id;
 …
     function populate() {
         global $wpdb, $bp, $creds;
         if ( $friendship = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->friends->table_name} WHERE id = %d", $this->id ) ) ) {
             $this->initiator_user_id = $friendship->initiator_user_id;
 …
             $this->date_created = $friendship->date_created;
+        }
         // if running from ajax.
         if ( !$bp->displayed_user->id )
             $bp->displayed_user->id = $creds['current_userid'];
         if ( $this->populate_friend_details ) {
             if ( $this->friend_user_id == $bp->displayed_user->id ) {
 …
+        }
+    }
     function save() {
         global $wpdb, $bp;
 …
         $this->date_created = apply_filters( 'friends_friendship_date_created_before_save', $this->date_created, $this->id );
         do_action( 'friends_friendship_before_save', $this );
+        do_action( 'friends_friendship_before_save', $this );
         if ( $this->id ) {
             // Update
 …
+        }
         do_action( 'friends_friendship_after_save', $this );
+        do_action( 'friends_friendship_after_save', $this );
         return $result;
+    }
     function delete() {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d", $this->id ) );
+    }
     /* Static Functions */
     function get_friend_user_ids( $user_id, $friend_requests_only = false, $assoc_arr = false ) {
         global $wpdb, $bp;
         if ( $friend_requests_only ) {
             $oc_sql = $wpdb->prepare( "AND is_confirmed = 0" );
 …
         $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" ) );
         for ( $i = 0; $i < count($friends); $i++ ) {
             if ( $assoc_arr )
 …
                 $fids[] = ( $friends[$i]->friend_user_id == $user_id ) ? $friends[$i]->initiator_user_id : $friends[$i]->friend_user_id;
+        }
         return $fids;
+    }
     function get_friendship_ids( $user_id, $friend_requests_only = false ) {
         global $wpdb, $bp;
 …
             $friend_sql = $wpdb->prepare ( " WHERE (initiator_user_id = %d OR friend_user_id = %d)", $user_id, $user_id );
+        }
         return $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->friends->table_name} $friend_sql $oc_sql" ) );
+    }
     function get_friendship_id( $user_id, $friend_id ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->friends->table_name} WHERE ( initiator_user_id = %d AND friend_user_id = %d ) OR ( initiator_user_id = %d AND friend_user_id = %d ) AND is_confirmed = 1", $user_id, $friend_id, $friend_id, $user_id ) );
+    }
     function total_friend_count( $user_id = false) {
         global $wpdb, $bp;
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         /* This is stored in 'total_friend_count' usermeta.
+        /* This is stored in 'total_friend_count' usermeta.
            This function will recalculate, update and return. */
         $count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d OR friend_user_id = %d) AND is_confirmed = 1", $user_id, $user_id ) );
         if ( !$count )
             return 0;
         update_usermeta( $user_id, 'total_friend_count', $count );
         return $count;
+    }
     function search_friends( $filter, $user_id, $limit = null, $page = null ) {
         global $wpdb, $bp;
         // TODO: Optimize this function.
         if ( !$user_id )
             $user_id = $bp->loggedin_user->id;
         $filter = like_escape( $wpdb->escape( $filter ) );
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( !$friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id ) )
             return false;
 …
         // Get all the user ids for the current user's friends.
         $fids = implode( ',', $friend_ids );
         if ( empty($fids) )
             return false;
 …
+        }
         $filtered_friend_ids = $wpdb->get_col($sql);
         $total_friend_ids = $wpdb->get_var($total_sql);
+        $filtered_friend_ids = $wpdb->get_col($sql);
+        $total_friend_ids = $wpdb->get_var($total_sql);
         if ( !$filtered_friend_ids )
             return false;
 …
         return array( 'friends' => $filtered_friend_ids, 'total' => (int)$total_friend_ids );
+    }
     function check_is_friend( $loggedin_userid, $possible_friend_userid ) {
         global $wpdb, $bp;
         if ( !$loggedin_userid || !$possible_friend_userid )
             return false;
         $result = $wpdb->get_results( $wpdb->prepare( "SELECT id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id = %d) OR (initiator_user_id = %d AND friend_user_id = %d)", $loggedin_userid, $possible_friend_userid, $possible_friend_userid, $loggedin_userid ) );
         if ( $result ) {
             if ( 0 == (int)$result[0]->is_confirmed ) {
 …
+        }
+    }
     function get_bulk_last_active( $user_ids ) {
         global $wpdb, $bp;
 …
         return $wpdb->get_results( $wpdb->prepare( "SELECT meta_value as last_activity, user_id FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'last_activity' AND user_id IN ( {$user_ids} ) ORDER BY meta_value DESC" ) );
+    }
     function accept($friendship_id) {
         global $wpdb, $bp;
 …
         return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = FROM_UNIXTIME(%d) WHERE id = %d AND friend_user_id = %d", time(), $friendship_id, $bp->loggedin_user->id ) );
+    }
     function reject($friendship_id) {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d AND friend_user_id = %d", $friendship_id, $bp->loggedin_user->id ) );
+    }
     function search_users( $filter, $user_id, $limit = null, $page = null ) {
         global $wpdb, $bp;
         $filter = like_escape( $wpdb->escape( $filter ) );
         $usermeta_table = $wpdb->base_prefix . 'usermeta';
         $users_table = $wpdb->base_prefix . 'users';
 …
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         // filter the user_ids based on the search criteria.
         if ( function_exists('xprofile_install') ) {
 …
             $sql = $wpdb->prepare( "SELECT DISTINCT user_id as id FROM $usermeta_table WHERE meta_value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
+        }
         $filtered_fids = $wpdb->get_col($sql);
+        $filtered_fids = $wpdb->get_col($sql);
         if ( !$filtered_fids )
             return false;
 …
         return $filtered_fids;
+    }
     function search_users_count( $filter ) {
         global $wpdb, $bp;
         $filter = like_escape( $wpdb->escape( $filter ) );
         $usermeta_table = $wpdb->prefix . 'usermeta';
         $users_table = $wpdb->base_prefix . 'users';
         // filter the user_ids based on the search criteria.
         if ( function_exists('xprofile_install') ) {
 …
+        }
         $user_count = $wpdb->get_col($sql);
+        $user_count = $wpdb->get_col($sql);
         if ( !$user_count )
             return false;
 …
         return $user_count[0];
+    }
     function sort_by_name( $user_ids ) {
         global $wpdb, $bp;
         if ( !function_exists( 'xprofile_install') )
             return false;
         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->profile->table_name_data} pd, {$bp->profile->table_name_fields} pf WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} ) ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
+    }
     function get_random_friends( $user_id, $total_friends = 5 ) {
         global $wpdb, $bp;
 …
             $fids[] = ( $results[$i]->friend_user_id == $user_id ) ? $results[$i]->initiator_user_id : $results[$i]->friend_user_id;
+        }
         // remove duplicates
         if ( count($fids) > 0 )
 …
             return false;
+    }
     function get_invitable_friend_count( $user_id, $group_id ) {
         global $wpdb, $bp;
         $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
         $invitable_count = 0;
         for ( $i = 0; $i < count($friend_ids); $i++ ) {
             if ( BP_Groups_Member::check_is_member( (int)$friend_ids[$i], $group_id ) )
                 continue;
             if ( BP_Groups_Member::check_has_invite( (int)$friend_ids[$i], $group_id )  )
                 continue;
             $invitable_count++;
+        }
 …
         return $invitable_count;
+    }
     function get_user_ids_for_friendship( $friendship_id ) {
         global $wpdb, $bp;
 …
         return $wpdb->get_row( $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} WHERE id = %d", $friendship_id ) );
+    }
     function delete_all_for_user( $user_id ) {
         global $wpdb, $bp;
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE friend_user_id = %d OR initiator_user_id = %d", $user_id, $user_id ) );
         // Delete friend request notifications for members who have a notification from this user.
+        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE friend_user_id = %d OR initiator_user_id = %d", $user_id, $user_id ) );
+        // Delete friend request notifications for members who have a notification from this user.
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE component_name = 'friends' AND ( component_action = 'friendship_request' OR component_action = 'friendship_accepted' ) AND item_id = %d", $user_id ) );
+    }
+}

trunk/bp-friends/bp-friends-notifications.php

-                      r1905
+                      r2077
 function friends_notification_new_request( $friendship_id, $initiator_id, $friend_id ) {
     global $bp;
     $initiator_name = bp_core_get_user_displayname( $initiator_id );
     if ( 'no' == get_usermeta( (int)$friend_id, 'notification_friends_friendship_request' ) )
         return false;
     $ud = get_userdata( $friend_id );
     $initiator_ud = get_userdata( $initiator_id );
     $all_requests_link = bp_core_get_user_domain( $friend_id ) . 'friends/requests/';
     $settings_link = bp_core_get_user_domain( $friend_id ) . 'settings/notifications';
     $initiator_link = bp_core_get_user_domain( $initiator_id );
 …
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
     $message = sprintf( __(
+    $message = sprintf( __(
 "%s wants to add you as a friend.
 …
 function friends_notification_accepted_request( $friendship_id, $initiator_id, $friend_id ) {
     global $bp;
     $friendship = new BP_Friends_Friendship( $friendship_id, false, false );
     $friend_name = bp_core_get_user_displayname( $friend_id );
     if ( 'no' == get_usermeta( (int)$initiator_id, 'notification_friends_friendship_accepted' ) )
         return false;
     $ud = get_userdata( $initiator_id );
     $friend_link = bp_core_get_user_domain( $friend_id );
     $settings_link = bp_core_get_user_domain( $initiator_id ) . 'settings/notifications';
+    $settings_link = bp_core_get_user_domain( $initiator_id ) . 'settings/notifications';
     // Set up and send the message
     $to = $ud->user_email;
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
     $message = sprintf( __(
+    $message = sprintf( __(
 '%s accepted your friend request.

trunk/bp-friends/bp-friends-templatetags.php

-                      r2032
+                      r2077
     var $friendships;
     var $friendship;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_friend_count;
     function bp_friendship_template( $user_id, $type, $per_page, $max, $filter ) {
         global $bp;
 …
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         $this->pag_page = isset( $_REQUEST['frpage'] ) ? intval( $_REQUEST['frpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 …
                 $this->friendships = friends_get_newest( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
             case 'alphabetical':
                 $this->friendships = friends_get_alphabetically( $user_id, $this->pag_num, $this->pag_page, $filter );
+                $this->friendships = friends_get_alphabetically( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
 …
             case 'active': default:
                 $this->friendships = friends_get_recently_active( $user_id, $this->pag_num, $this->pag_page, $filter );
+                $this->friendships = friends_get_recently_active( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
+        }
 …
         ));
+    }
     function has_friendships() {
         if ( $this->friendship_count )
             return true;
         return false;
+    }
     function next_friendship() {
         $this->current_friendship++;
         $this->friendship = $this->friendships[$this->current_friendship];
         return $this->friendship;
+    }
     function rewind_friendships() {
         $this->current_friendship = -1;
 …
+        }
+    }
     function user_friendships() {
+    function user_friendships() {
         if ( $this->current_friendship + 1 < $this->friendship_count ) {
             return true;
 …
         return false;
+    }
     function the_friendship() {
         global $friendship, $bp;
 …
             else
                 $user_id = $this->friendship->user_id;
             $this->friendship = new stdClass;
             if ( !$this->friendship->friend = wp_cache_get( 'bp_user_' . $user_id, 'bp' ) ) {
                 $this->friendship->friend = new BP_Core_User( $user_id );
                 wp_cache_set( 'bp_user_' . $user_id, $this->friendship->friend, 'bp' );
+            }
             /* Make sure the user_id is available in the friend object. */
             $this->friendship->friend->user_id = $user_id;
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     /* The following code will auto set parameters based on the page being viewed.
      * for example on example.com/members/andy/friends/my-friends/newest/
 …
         $type = 'requests';
+    }
     if ( isset( $_REQUEST['friend-search-box'] ) )
         $filter = $_REQUEST['friend-search-box'];
 …
     function bp_get_friend_id() {
         global $friends_template;
         return apply_filters( 'bp_get_friend_id', $friends_template->friendship->friend->user_id );
+        return apply_filters( 'bp_get_friend_id', $friends_template->friendship->friend->user_id );
+    }
 …
     function bp_get_friend_name() {
         global $friends_template;
         return apply_filters( 'bp_get_friend_name', strip_tags( $friends_template->friendship->friend->user_link ) );
+    }
+        return apply_filters( 'bp_get_friend_name', strip_tags( $friends_template->friendship->friend->user_link ) );
+    }
 function bp_friend_link() {
     echo bp_get_friend_link();
 …
         return apply_filters( 'bp_get_friend_last_active', $friends_template->friendship->friend->last_active );
+    }
 function bp_friend_time_since_requested() {
     echo bp_get_friend_time_since_requested();
 …
             return apply_filters( 'bp_friend_time_since_requested', sprintf( __( 'requested %s ago', 'buddypress' ), bp_core_time_since( strtotime( $friends_template->friendship->date_created ) ) ) );
+        }
         return false;
+    }
 …
         global $friends_template, $bp;
         return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friends_template->friendship->id, 'friends_reject_friendship' ) );
+        return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friends_template->friendship->id, 'friends_reject_friendship' ) );
+    }
 …
     function bp_get_friend_pagination() {
         global $friends_template;
         return apply_filters( 'bp_friend_pagination', $friends_template->pag_links );
+    }
 …
     echo sprintf( __( 'Viewing friend %d to %d (of %d friends)', 'buddypress' ), $from_num, $to_num, $friends_template->total_friend_count ); ?> &nbsp;
     <span class="ajax-loader"></span><?php
+    <span class="ajax-loader"></span><?php
+}
 …
         return apply_filters( 'bp_get_friend_total_for_member', BP_Friends_Friendship::total_friend_count() );
+    }
 function bp_friend_search_form() {
     global $friends_template, $bp;
 …
         <label for="friend-search-box" id="friend-search-label"><?php echo $label ?></label>
         <input type="search" name="friend-search-box" id="friend-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
         <?php wp_nonce_field( 'friends_search', '_wpnonce_friend_search' ) ?>
         <input type="hidden" name="initiator" id="initiator" value="<?php echo attribute_escape( $bp->displayed_user->id ) ?>" />
     </form>
 <?php
 …
     if ( isset( $_POST['friend-search-box'] ) )
         return true;
     return false;
+}
 …
 function bp_friend_latest_update_link() {
     global $bp;
     echo apply_filters( 'bp_friend_latest_update_link', $bp->displayed_user->domain . 'my-friends/last-updated' );
+    echo apply_filters( 'bp_friend_latest_update_link', $bp->displayed_user->domain . 'my-friends/last-updated' );
+}
 function bp_friend_recent_activity_link() {
     global $bp;
     echo apply_filters( 'bp_friend_recent_activity_link', $bp->displayed_user->domain . 'my-friends/recently-active' );
+    echo apply_filters( 'bp_friend_recent_activity_link', $bp->displayed_user->domain . 'my-friends/recently-active' );
+}
 function bp_friend_recent_status_link() {
     global $bp;
     echo apply_filters( 'bp_friend_recent_status_link', $bp->displayed_user->domain . 'my-friends/status-updates' );
+    echo apply_filters( 'bp_friend_recent_status_link', $bp->displayed_user->domain . 'my-friends/status-updates' );
+}
 …
     function bp_get_add_friend_button( $potential_friend_id = false ) {
         global $bp, $friends_template;
         $button = false;
         if ( is_user_logged_in() ) {
             if ( !$potential_friend_id && $friends_template->friendship->friend )
                 $potential_friend_id = $friends_template->friendship->friend->id;
 …
             $button .= '</div>';
+        }
         return apply_filters( 'bp_get_add_friend_button', $button );
+    }
 …
 function bp_friends_filter_title() {
     global $bp;
     $current_filter = $bp->action_variables[0];
     switch ( $current_filter ) {
         case 'recently-active': default:
 …
 function bp_friends_random_friends() {
     global $bp;
     if ( !$friend_ids = wp_cache_get( 'friends_friend_ids_' . $bp->displayed_user->id, 'bp' ) ) {
         $friend_ids = BP_Friends_Friendship::get_random_friends( $bp->displayed_user->id );
         wp_cache_set( 'friends_friend_ids_' . $bp->displayed_user->id, $friend_ids, 'bp' );
+    }
 ?>
+?>
     <div class="info-group">
         <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?>  (<?php echo BP_Friends_Friendship::total_friend_count( $bp->displayed_user->id ) ?>) <span><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></span></h4>
         <?php if ( $friend_ids ) { ?>
             <ul class="horiz-gallery">
 …
 function bp_friends_random_members( $total_members = 5 ) {
     global $bp;
     if ( !$user_ids = wp_cache_get( 'friends_random_users', 'bp' ) ) {
         $user_ids = BP_Core_User::get_random_users( $total_members );
         wp_cache_set( 'friends_random_users', $user_ids, 'bp' );
+    }
 ?>
+?>
     <?php if ( $user_ids['users'] ) { ?>
         <ul class="item-list" id="random-members-list">
 …
                     </div>
                 <?php } ?>
                 <div class="action">
                     <?php if ( function_exists( 'bp_add_friend_button' ) ) { ?>
 …
         <div id="message" class="info">
             <p><?php _e( "There aren't enough site members to show a random sample just yet.", 'buddypress' ) ?></p>
         </div>
+        </div>
     <?php } ?>
 <?php

trunk/bp-groups.php

-                      r2070
+                      r2077
 /* Include deprecated functions if settings allow */
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
     require ( BP_PLUGIN_DIR . '/bp-groups/deprecated/bp-groups-deprecated.php' );
+    require ( BP_PLUGIN_DIR . '/bp-groups/deprecated/bp-groups-deprecated.php' );
 function groups_install() {
     global $wpdb, $bp;
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     $sql[] = "CREATE TABLE {$bp->groups->table_name} (
             id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
             KEY status (status)
            ) {$charset_collate};";
     $sql[] = "CREATE TABLE {$bp->groups->table_name_members} (
             id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
             KEY meta_key (meta_key)
            ) {$charset_collate};";
     require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
     dbDelta($sql);
     /* On upgrade, handle moving of old group avatars */
     $groups = groups_get_all();
     foreach ( $groups as $group ) {
         /* Don't fetch and move gravs, default images or empties */
 …
             if ( !file_exists( $avatar_thumb ) || !file_exists( $avatar_full ) )
                 continue;
             $upload_dir = groups_avatar_upload_dir( $group->id );
 …
+        }
+    }
     if ( function_exists('bp_wire_install') )
         groups_wire_install();
     update_site_option( 'bp-groups-db-version', BP_GROUPS_DB_VERSION );
+}
 …
 function groups_wire_install() {
     global $wpdb, $bp;
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     $sql[] = "CREATE TABLE {$bp->groups->table_name_wire} (
             id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
     /* For internal identification */
     $bp->groups->id = 'groups';
     $bp->groups->table_name = $wpdb->base_prefix . 'bp_groups';
     $bp->groups->table_name_members = $wpdb->base_prefix . 'bp_groups_members';
 …
     /* Register this in the active components array */
     $bp->active_components[$bp->groups->slug] = $bp->groups->id;
     if ( function_exists('bp_wire_install') )
         $bp->groups->table_name_wire = $wpdb->base_prefix . 'bp_groups_wire';
     $bp->groups->forbidden_names = apply_filters( 'groups_forbidden_names', array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' ) );
     $bp->groups->group_creation_steps = apply_filters( 'groups_create_group_steps', array(
         'group-details' => array( 'name' => __( 'Group Details', 'buddypress' ), 'position' => 0 ),
+    $bp->groups->group_creation_steps = apply_filters( 'groups_create_group_steps', array(
+        'group-details' => array( 'name' => __( 'Group Details', 'buddypress' ), 'position' => 0 ),
         'group-settings' => array( 'name' => __( 'Group Settings', 'buddypress' ), 'position' => 10 ),
         'group-avatar' => array( 'name' => __( 'Group Avatar', 'buddypress' ), 'position' => 20 ),
         'group-invites' => array( 'name' => __( 'Group Invites', 'buddypress' ), 'position' => 30 )
     ) );
     $bp->groups->valid_status = apply_filters( 'groups_valid_status', array( 'public', 'private', 'hidden' ) );
     do_action( 'groups_setup_globals' );
+}
 add_action( 'plugins_loaded', 'groups_setup_globals', 5 );
+add_action( 'plugins_loaded', 'groups_setup_globals', 5 );
 add_action( 'admin_menu', 'groups_setup_globals', 2 );
 …
 add_action( 'plugins_loaded', 'groups_setup_root_component', 2 );
 function groups_check_installed() {
+function groups_check_installed() {
     global $wpdb, $bp;
     require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-admin.php' );
 …
 function groups_add_admin_menu() {
     global $wpdb, $bp;
     if ( !is_site_admin() )
         return false;
     /* Add the administration tab under the "Site Admin" tab for site administrators */
     add_submenu_page( 'wpmu-admin.php', __("Groups", 'buddypress'), __("Groups", 'buddypress'), 1, "groups_admin_settings", "groups_admin_settings" );
 …
 function groups_setup_nav() {
     global $bp, $current_blog, $group_obj;
     if ( $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
         /* This is a single group page. */
         $bp->is_single_item = true;
         $bp->groups->current_group = &new BP_Groups_Group( $group_id );
         /* Using "item" not "group" for generic support in other components. */
         if ( is_site_admin() )
 …
         else
             $bp->is_item_admin = groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id );
         /* If the user is not an admin, check if they are a moderator */
         if ( !$bp->is_item_admin )
             $bp->is_item_mod = groups_is_user_mod( $bp->loggedin_user->id, $bp->groups->current_group->id );
         /* Is the logged in user a member of the group? */
         $bp->groups->current_group->is_user_member = ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ? true : false;
         /* Should this group be visible to the logged in user? */
         $bp->groups->current_group->is_group_visible_to_member = ( 'public' == $bp->groups->current_group->status || $is_member ) ? true : false;
         /* Pre 1.1 backwards compatibility - use $bp->groups->current_group instead */
         $group_obj = &$bp->groups->current_group;
 …
     /* Add 'Groups' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __('Groups', 'buddypress'), 'slug' => $bp->groups->slug, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
     $groups_link = $bp->loggedin_user->domain . $bp->groups->slug . '/';
     /* Add the subnav items to the groups nav item */
     bp_core_new_subnav_item( array( 'name' => __( 'My Groups', 'buddypress' ), 'slug' => 'my-groups', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_my_groups', 'position' => 10, 'item_css_id' => 'groups-my-groups' ) );
 …
     if ( $bp->current_component == $bp->groups->slug ) {
         if ( bp_is_home() && !$bp->is_single_item ) {
             $bp->bp_options_title = __( 'My Groups', 'buddypress' );
         } else if ( !bp_is_home() && !$bp->is_single_item ) {
             $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
             $bp->bp_options_title = $bp->displayed_user->fullname;
         } else if ( $bp->is_single_item ) {
             // We are viewing a single group, so set up the
             // group navigation menu using the $bp->groups->current_group global.
             /* When in a single group, the first action is bumped down one because of the
                group name, so we need to adjust this and set the group name to current_item. */
 …
             $bp->current_action = $bp->action_variables[0];
             array_shift($bp->action_variables);
             $bp->bp_options_title = $bp->groups->current_group->name;
             if ( !$bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'type' => 'thumb', 'avatar_dir' => 'group-avatars', 'alt' => __( 'Group Avatar', 'buddypress' ) ) ) )
                 $bp->bp_options_avatar = '<img src="' . attribute_escape( $group->avatar_full ) . '" class="avatar" alt="' . attribute_escape( $group->name ) . '" />';
             $group_link = $bp->root_domain . '/' . $bp->groups->slug . '/' . $bp->groups->current_group->slug . '/';
             // If this is a private or hidden group, does the user have access?
             if ( 'private' == $bp->groups->current_group->status || 'hidden' == $bp->groups->current_group->status ) {
 …
             /* Reset the existing subnav items */
             bp_core_reset_subnav_items($bp->groups->slug);
             /* Add a new default subnav item for when the groups nav is selected. */
             bp_core_new_nav_default( array( 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_home', 'subnav_slug' => 'home' ) );
             /* Add the "Home" subnav item, as this will always be present */
             bp_core_new_subnav_item( array( 'name' => __( 'Home', 'buddypress' ), 'slug' => 'home', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_home', 'position' => 10, 'item_css_id' => 'group-home' ) );
             /* If the user is a group mod or more, then show the group admin nav item */
             if ( $bp->is_item_mod || $bp->is_item_admin )
 …
             bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-members'  ) );
             if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
                 if ( function_exists('friends_install') )
 …
+        }
+    }
     do_action( 'groups_setup_nav', $bp->groups->current_group->user_has_access );
+}
 …
 function groups_setup_adminbar_menu() {
     global $bp;
     if ( !$bp->groups->current_group )
         return false;
 …
     <li id="bp-adminbar-adminoptions-menu">
         <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
         <ul>
             <li><a class="confirm" href="<?php echo wp_nonce_url( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/delete-group/', 'groups_delete_group' ) ?>&amp;delete-group-button=1&amp;delete-group-understand=1"><?php _e( "Delete Group", 'buddypress' ) ?></a></li>
             <?php do_action( 'groups_adminbar_menu_items' ) ?>
         </ul>
 …
 function groups_screen_my_groups() {
     global $bp;
     bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
     bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
     do_action( 'groups_screen_my_groups' );
     bp_core_load_template( apply_filters( 'groups_template_my_groups', 'groups/index' ) );
+}
 …
 function groups_screen_group_invites() {
     global $bp;
     $group_id = $bp->action_variables[1];
     if ( isset($bp->action_variables) && in_array( 'accept', (array)$bp->action_variables ) && is_numeric($group_id) ) {
         /* Check the nonce */
         if ( !check_admin_referer( 'groups_accept_invite' ) )
             return false;
         if ( !groups_accept_invite( $bp->loggedin_user->id, $group_id ) ) {
             bp_core_add_message( __('Group invite could not be accepted', 'buddypress'), 'error' );
+            bp_core_add_message( __('Group invite could not be accepted', 'buddypress'), 'error' );
         } else {
             bp_core_add_message( __('Group invite accepted', 'buddypress') );
             /* Record this in activity streams */
             $group = new BP_Groups_Group( $group_id, false, false );
             groups_record_activity( array(
                 'content' => apply_filters( 'groups_activity_accepted_invite', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
+                'content' => apply_filters( 'groups_activity_accepted_invite', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),
                 'primary_link' => apply_filters( 'groups_activity_accepted_invite_primary_link', bp_get_group_permalink( $group ), &$group ),
                 'component_action' => 'joined_group',
 …
         bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
     } else if ( isset($bp->action_variables) && in_array( 'reject', (array)$bp->action_variables ) && is_numeric($group_id) ) {
         /* Check the nonce */
         if ( !check_admin_referer( 'groups_reject_invite' ) )
             return false;
         if ( !groups_reject_invite( $bp->loggedin_user->id, $group_id ) ) {
             bp_core_add_message( __('Group invite could not be rejected', 'buddypress'), 'error' );
         } else {
             bp_core_add_message( __('Group invite rejected', 'buddypress') );
+            bp_core_add_message( __('Group invite could not be rejected', 'buddypress'), 'error' );
+        } else {
+            bp_core_add_message( __('Group invite rejected', 'buddypress') );
+        }
         bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
+    }
     // Remove notifications
     bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'group_invite' );
     do_action( 'groups_screen_group_invites', $group_id );
     if ( '' != locate_template( array( 'groups/invites.php' ), false ) )
         bp_core_load_template( apply_filters( 'groups_template_group_invites', 'groups/invites' ) );
     else
         bp_core_load_template( apply_filters( 'groups_template_group_invites', 'groups/list-invites' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_invites', 'groups/list-invites' ) );
+}
 …
         unset( $bp->groups->current_create_step );
         unset( $bp->groups->completed_create_steps );
         setcookie( 'bp_new_group_id', false, time() - 1000, COOKIEPATH );
         setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH );
         $reset_steps = true;
         bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . array_shift( array_keys( $bp->groups->group_creation_steps )  ) );
+    }
     /* If this is a creation step that is not recognized, just redirect them back to the first screen */
     if ( $bp->action_variables[1] && !$bp->groups->group_creation_steps[$bp->action_variables[1]] ) {
 …
     /* If the save, upload or skip button is hit, lets calculate what we need to save */
     if ( isset( $_POST['save'] ) ) {
         /* Check the nonce */
         check_admin_referer( 'groups_create_save_' . $bp->groups->current_create_step );
         if ( 'group-details' == $bp->groups->current_create_step ) {
             if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) ) {
 …
                 bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+            }
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'news' => $_POST['group-news'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => time() ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
                 bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+            }
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+            }
             groups_update_groupmeta( $bp->groups->new_group_id, 'total_member_count', 1 );
             groups_update_groupmeta( $bp->groups->new_group_id, 'last_activity', time() );
 …
             groups_update_groupmeta( $bp->groups->new_group_id, 'stylesheet', 'buddypress' );
+        }
         if ( 'group-settings' == $bp->groups->current_create_step ) {
             $group_status = 'public';
             $group_enable_wire = 1;
             $group_enable_forum = 1;
             if ( !isset($_POST['group-show-wire']) )
                 $group_enable_wire = 0;
             if ( !isset($_POST['group-show-forum']) ) {
                 $group_enable_forum = 0;
 …
+                }
+            }
             if ( 'private' == $_POST['group-status'] )
                 $group_status = 'private';
             else if ( 'hidden' == $_POST['group-status'] )
                 $group_status = 'hidden';
             if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_wire' => $group_enable_wire, 'enable_forum' => $group_enable_forum ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
                 bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+            }
+        }
 …
         do_action( 'groups_create_group_step_save_' . $bp->groups->current_create_step );
         do_action( 'groups_create_group_step_complete' ); // Mostly for clearing cache on a generic action name
         /**
          * Once we have successfully saved the details for this step of the creation process
 …
         if ( !in_array( $bp->groups->current_create_step, (array)$bp->groups->completed_create_steps ) )
             $bp->groups->completed_create_steps[] = $bp->groups->current_create_step;
         /* Reset cookie info */
         setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH );
         setcookie( 'bp_completed_create_steps', serialize( $bp->groups->completed_create_steps ), time()+60*60*24, COOKIEPATH );
+        setcookie( 'bp_completed_create_steps', serialize( $bp->groups->completed_create_steps ), time()+60*60*24, COOKIEPATH );
         /* If we have completed all steps and hit done on the final step we can redirect to the completed group */
 …
             unset( $bp->groups->current_create_step );
             unset( $bp->groups->completed_create_steps );
             /* Once we compelete all steps, record the group creation in the activity stream. */
             groups_record_activity( array(
                 'content' => apply_filters( 'groups_activity_created_group', sprintf( __( '%s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
+                'content' => apply_filters( 'groups_activity_created_group', sprintf( __( '%s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
                 'primary_link' => apply_filters( 'groups_activity_created_group_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
                 'component_action' => 'created_group',
                 'item_id' => $bp->groups->new_group_id
             ) );
             do_action( 'groups_group_create_complete', $bp->groups->new_group_id );
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
         } else {
 …
             foreach ( $bp->groups->group_creation_steps as $key => $value ) {
                 if ( $key == $bp->groups->current_create_step ) {
                     $next = 1;
+                    $next = 1;
                     continue;
+                }
                 if ( $next ) {
                     $next_step = $key;
+                    $next_step = $key;
                     break;
+                }
 …
+        }
+    }
     /* Group avatar is handled separately */
     if ( 'group-avatar' == $bp->groups->current_create_step && isset( $_POST['upload'] ) ) {
 …
             /* Pass the file to the avatar upload handler */
             if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
+            if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
                 $bp->avatar_admin->step = 'crop-image';
 …
         if ( isset( $_POST['avatar-crop-submit'] ) && isset( $_POST['upload'] ) ) {
             /* Normally we would check a nonce here, but the group save nonce is used instead */
             if ( !bp_core_avatar_handle_crop( array( 'object' => 'group', 'avatar_dir' => 'group-avatars', 'item_id' => $bp->groups->current_group->id, 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
                 bp_core_add_message( __( 'There was an error saving the group avatar, please try uploading again.', 'buddypress' ), 'error' );
 …
 function groups_screen_group_home() {
     global $bp;
     if ( $bp->is_single_item ) {
         if ( isset($_GET['new']) ) {
             // Delete group request notifications for the user
 …
             bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
             bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
+        }
         do_action( 'groups_screen_group_home' );
+        }
+        do_action( 'groups_screen_group_home' );
         if ( '' != locate_template( array( 'groups/single/home.php' ), false ) )
             bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
 …
 function groups_screen_group_forum() {
     global $bp;
     if ( $bp->is_single_item && $bp->groups->current_group->user_has_access ) {
         /* Fetch the details we need */
         $topic_slug = $bp->action_variables[1];
 …
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_new_reply' );
                 /* Auto join this user if they are not yet a member of this group */
                 if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                     groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
                 if ( !groups_new_group_forum_post( $_POST['reply_text'], $topic_id ) )
                     bp_core_add_message( __( 'There was an error when replying to that topic', 'buddypress'), 'error' );
                 else
                     bp_core_add_message( __( 'Your reply was posted successfully', 'buddypress') );
                 if ( $_SERVER['QUERY_STRING'] )
                     $query_vars = '?' . $_SERVER['QUERY_STRING'];
+                    $query_vars = '?' . $_SERVER['QUERY_STRING'];
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' . $query_vars );
+            }
             /* Sticky a topic */
             else if ( 'stick' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
 …
                 else
                     bp_core_add_message( __( 'The topic was made sticky successfully', 'buddypress' ) );
                 do_action( 'groups_stick_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
+            }
             /* Un-Sticky a topic */
             else if ( 'unstick' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_unstick_topic' );
                 if ( !bp_forums_sticky_topic( array( 'topic_id' => $topic_id, 'mode' => 'unstick' ) ) )
                     bp_core_add_message( __( 'There was an error when unsticking that topic', 'buddypress'), 'error' );
                 else
                     bp_core_add_message( __( 'The topic was unstuck successfully', 'buddypress') );
                 do_action( 'groups_unstick_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
+            }
             /* Close a topic */
             else if ( 'close' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_close_topic' );
                 if ( !bp_forums_openclose_topic( array( 'topic_id' => $topic_id ) ) )
                     bp_core_add_message( __( 'There was an error when closing that topic', 'buddypress'), 'error' );
                 else
                     bp_core_add_message( __( 'The topic was closed successfully', 'buddypress') );
                 do_action( 'groups_close_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
 …
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_open_topic' );
                 if ( !bp_forums_openclose_topic( array( 'topic_id' => $topic_id, 'mode' => 'open' ) ) )
                     bp_core_add_message( __( 'There was an error when opening that topic', 'buddypress'), 'error' );
                 else
                     bp_core_add_message( __( 'The topic was opened successfully', 'buddypress') );
                 do_action( 'groups_open_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
 …
                 if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$topic->topic_poster )
                     bp_core_redirect( wp_get_referer() );
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_delete_topic' );
                 if ( !groups_delete_group_forum_topic( $topic_id ) )
                     bp_core_add_message( __( 'There was an error deleting the topic', 'buddypress'), 'error' );
                 else
                     bp_core_add_message( __( 'The topic was deleted successfully', 'buddypress') );
                 do_action( 'groups_delete_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
+            }
             /* Editing a topic */
             else if ( 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
 …
                     /* Check the nonce */
                     check_admin_referer( 'bp_forums_edit_topic' );
                     if ( !groups_update_group_forum_topic( $topic_id, $_POST['topic_title'], $_POST['topic_text'] ) )
                         bp_core_add_message( __( 'There was an error when editing that topic', 'buddypress'), 'error' );
                     else
                         bp_core_add_message( __( 'The topic was edited successfully', 'buddypress') );
                     do_action( 'groups_edit_forum_topic', $topic_id );
                     bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
+                }
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
+            }
             /* Delete a post */
             else if ( 'delete' == $bp->action_variables[2] && $post_id = $bp->action_variables[4] ) {
 …
                 else
                     bp_core_add_message( __( 'The post was deleted successfully', 'buddypress') );
                 do_action( 'groups_delete_forum_post', $post_id );
                 bp_core_redirect( wp_get_referer() );
+            }
             /* Editing a post */
             else if ( 'edit' == $bp->action_variables[2] && $post_id = $bp->action_variables[4] ) {
 …
                     /* Check the nonce */
                     check_admin_referer( 'bp_forums_edit_post' );
                     if ( !groups_update_group_forum_post( $post_id, $_POST['post_text'], $topic_id ) )
                         bp_core_add_message( __( 'There was an error when editing that post', 'buddypress'), 'error' );
                     else
                         bp_core_add_message( __( 'The post was edited successfully', 'buddypress') );
                     do_action( 'groups_edit_forum_post', $post_id );
                     bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
+                }
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
+            }
 …
                     bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/forum/topic' ) );
+            }
         } else {
             /* Posting a topic */
             if ( isset( $_POST['submit_topic'] ) && function_exists( 'bp_forums_new_topic') ) {
                 /* Check the nonce */
+                /* Check the nonce */
                 check_admin_referer( 'bp_forums_new_topic' );
                 /* Auto join this user if they are not yet a member of this group */
                 if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
 …
                 else
                     bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug . '/' );
+            }
             do_action( 'groups_screen_group_forum', $topic_id, $forum_id );
             if ( '' != locate_template( array( 'groups/single/forum/index.php' ), false ) )
                 bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/forum/index' ) );
             else
                 bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/forum/index' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/forum/index' ) );
+        }
+    }
 …
 function groups_screen_group_wire() {
     global $bp;
     $wire_action = $bp->action_variables[0];
     if ( $bp->is_single_item ) {
         if ( 'post' == $wire_action && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
             /* Check the nonce first. */
             if ( !check_admin_referer( 'bp_wire_post' ) )
+            if ( !check_admin_referer( 'bp_wire_post' ) )
                 return false;
             if ( !groups_new_wire_post( $bp->groups->current_group->id, $_POST['wire-post-textarea'] ) )
                 bp_core_add_message( __('Wire message could not be posted.', 'buddypress'), 'error' );
 …
             else
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
         } else if ( 'delete' == $wire_action && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
             $wire_message_id = $bp->action_variables[1];
 …
             if ( !check_admin_referer( 'bp_wire_delete_link' ) )
                 return false;
             if ( !groups_delete_wire_post( $wire_message_id, $bp->groups->table_name_wire ) )
                 bp_core_add_message( __('There was an error deleting the wire message.', 'buddypress'), 'error' );
             else
                 bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
             if ( !strpos( wp_get_referer(), $bp->wire->slug ) )
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
             else
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
         } else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) {
             if ( '' != locate_template( array( 'groups/single/wire.php' ), false ) )
                 bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/single/wire' ) );
             else
+            else
                 bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/wire' ) );
         } else {
             if ( '' != locate_template( array( 'groups/single/home.php' ), false ) )
                 bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
             else
+            else
                 bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
+        }
 …
 function groups_screen_group_members() {
     global $bp;
     if ( $bp->is_single_item ) {
         do_action( 'groups_screen_group_members', $bp->groups->current_group->id );
 …
             bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/members' ) );
         else
             bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/list-members' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/list-members' ) );
+    }
+}
 …
 function groups_screen_group_invite() {
     global $bp;
     if ( $bp->is_single_item ) {
         if ( isset($bp->action_variables) && 'send' == $bp->action_variables[0] ) {
             if ( !check_admin_referer( 'groups_send_invites', '_wpnonce_send_invites' ) )
                 return false;
             // Send the invites.
             groups_send_invites( $bp->loggedin_user->id, $bp->groups->current_group->id );
             bp_core_add_message( __('Group invites sent.', 'buddypress') );
 …
             // Show send invite page
             if ( '' != locate_template( array( 'groups/single/send-invite.php' ), false ) )
                 bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/single/send-invite' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/single/send-invite' ) );
             else
                 bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/send-invite' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/send-invite' ) );
+        }
+    }
 …
 function groups_screen_group_leave() {
     global $bp;
     if ( $bp->is_single_item ) {
         if ( isset($bp->action_variables) && 'yes' == $bp->action_variables[0] ) {
             // Check if the user is the group admin first.
             if ( groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
 …
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+            }
             // remove the user from the group.
             if ( !groups_leave_group( $bp->groups->current_group->id ) ) {
 …
                 bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug );
+            }
         } else if ( isset($bp->action_variables) && 'no' == $bp->action_variables[0] ) {
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
         } else {
             do_action( 'groups_screen_group_leave', $bp->groups->current_group->id );
             // Show leave group page
             if ( '' != locate_template( array( 'groups/single/leave-confirm.php' ), false ) )
                 bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/single/leave-confirm' ) );
             else
                 bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/leave-group-confirm' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/leave-group-confirm' ) );
+        }
+    }
 …
 function groups_screen_group_request_membership() {
     global $bp;
     if ( !is_user_logged_in() )
         return false;
     if ( 'private' == $bp->groups->current_group->status ) {
         // If the user has submitted a request, send it.
 …
             if ( !check_admin_referer( 'groups_request_membership' ) )
                 return false;
             if ( !groups_send_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
                 bp_core_add_message( __( 'There was an error sending your group membership request, please try again.', 'buddypress' ), 'error' );
 …
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+        }
         do_action( 'groups_screen_group_request_membership', $bp->groups->current_group->id );
         if ( '' != locate_template( array( 'groups/single/request-membership.php' ), false ) )
             bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/single/request-membership' ) );
         else
             bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/request-membership' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/request-membership' ) );
+    }
+}
 …
 function groups_screen_group_admin() {
     global $bp;
     if ( $bp->current_component != BP_GROUPS_SLUG || 'admin' != $bp->current_action )
         return false;
     if ( !empty( $bp->action_variables[0] ) )
         return false;
     bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/edit-details' );
+}
 …
 function groups_screen_group_admin_edit_details() {
     global $bp;
     if ( $bp->current_component == $bp->groups->slug && 'edit-details' == $bp->action_variables[0] ) {
         if ( $bp->is_item_admin || $bp->is_item_mod  ) {
             // If the edit form has been submitted, save the edited details
             if ( isset( $_POST['save'] ) ) {
 …
                 if ( !check_admin_referer( 'groups_edit_group_details' ) )
                     return false;
                 if ( !groups_edit_base_group_details( $_POST['group-id'], $_POST['group-name'], $_POST['group-desc'], $_POST['group-news'], (int)$_POST['group-notify-members'] ) ) {
                     bp_core_add_message( __( 'There was an error updating group details, please try again.', 'buddypress' ), 'error' );
 …
                     bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) );
+                }
                 do_action( 'groups_group_details_edited', $bp->groups->current_group->id );
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/edit-details' );
+            }
 …
             if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
                 bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );
             else
                 bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/admin/edit-details' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/admin/edit-details' ) );
+        }
+    }
 …
 function groups_screen_group_admin_settings() {
     global $bp;
     if ( $bp->current_component == $bp->groups->slug && 'group-settings' == $bp->action_variables[0] ) {
         if ( !$bp->is_item_admin )
             return false;
         // If the edit form has been submitted, save the edited details
         if ( isset( $_POST['save'] ) ) {
 …
             $enable_photos = ( isset($_POST['group-show-photos'] ) ) ? 1 : 0;
             $photos_admin_only = ( $_POST['group-photos-status'] != 'all' ) ? 1 : 0;
             $allowed_status = apply_filters( 'groups_allowed_status', array( 'public', 'private', 'hidden' ) );
             $status = ( in_array( $_POST['group-status'], (array)$allowed_status ) ) ? $_POST['group-status'] : 'public';
             /* Check the nonce first. */
             if ( !check_admin_referer( 'groups_edit_group_settings' ) )
                 return false;
             if ( !groups_edit_group_settings( $_POST['group-id'], $enable_wire, $enable_forum, $enable_photos, $photos_admin_only, $status ) ) {
                 bp_core_add_message( __( 'There was an error updating group settings, please try again.', 'buddypress' ), 'error' );
 …
             do_action( 'groups_group_settings_edited', $bp->groups->current_group->id );
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/group-settings' );
+        }
         do_action( 'groups_screen_group_admin_settings', $bp->groups->current_group->id );
         if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
             bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/single/admin' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/single/admin' ) );
         else
             bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/admin/group-settings' ) );
 …
 function groups_screen_group_admin_avatar() {
     global $bp;
     if ( $bp->current_component == $bp->groups->slug && 'group-avatar' == $bp->action_variables[0] ) {
         if ( !$bp->is_item_admin )
             return false;
         /* If the group admin has deleted the admin avatar */
         if ( 'delete' == $bp->action_variables[1] ) {
             /* Check the nonce */
             check_admin_referer( 'bp_group_avatar_delete' );
             if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group' ) ) )
                 bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
             else
                 bp_core_add_message( __( 'There was a problem deleting that avatar, please try again.', 'buddypress' ), 'error' );
+        }
+        }
         $bp->avatar_admin->step = 'upload-image';
 …
             /* Pass the file to the avatar upload handler */
             if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
+            if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
                 $bp->avatar_admin->step = 'crop-image';
 …
+        }
         do_action( 'groups_screen_group_admin_avatar', $bp->groups->current_group->id );
+        do_action( 'groups_screen_group_admin_avatar', $bp->groups->current_group->id );
         if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
             bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/single/admin' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/single/admin' ) );
         else
             bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/admin/group-avatar' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/admin/group-avatar' ) );
+    }
+}
 …
     if ( $bp->current_component == $bp->groups->slug && 'manage-members' == $bp->action_variables[0] ) {
         if ( !$bp->is_item_admin )
             return false;
         if ( 'promote' == $bp->action_variables[1] && ( 'mod' == $bp->action_variables[2] || 'admin' == $bp->action_variables[2] ) && is_numeric( $bp->action_variables[3] ) ) {
             $user_id = $bp->action_variables[3];
             $status = $bp->action_variables[2];
             /* Check the nonce first. */
             if ( !check_admin_referer( 'groups_promote_member' ) )
                 return false;
             // Promote a user.
             if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) ) {
 …
                 bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) );
+            }
             do_action( 'groups_promoted_member', $user_id, $bp->groups->current_group->id );
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/manage-members' );
+        }
         if ( 'demote' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
             $user_id = $bp->action_variables[2];
 …
             /* Check if the user is the group admin first. */
             if ( groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
                 bp_core_add_message(  __('As the only group administrator, you cannot demote yourself.', 'buddypress'), 'error' );
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+                    bp_core_add_message(  __('As the only group administrator, you cannot demote yourself.', 'buddypress'), 'error' );
+                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+            }
 …
             if ( !check_admin_referer( 'groups_demote_member' ) )
                 return false;
             // Demote a user.
             if ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) ) {
 …
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/manage-members' );
+        }
         if ( 'ban' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
             $user_id = $bp->action_variables[2];
 …
             /* Check if the user is the group admin first. */
             if ( groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
                 bp_core_add_message(  __('As the only group administrator, you cannot ban yourself.', 'buddypress'), 'error' );
                 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+                    bp_core_add_message(  __('As the only group administrator, you cannot ban yourself.', 'buddypress'), 'error' );
+                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+            }
 …
             if ( !check_admin_referer( 'groups_ban_member' ) )
                 return false;
             // Ban a user.
             if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) ) {
 …
             bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/manage-members' );
+        }
         if ( 'unban' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
             $user_id = $bp->action_variables[2];
 …
             if ( !check_admin_referer( 'groups_unban_member' ) )
                 return false;
             // Remove a ban for user.
             if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) ) {
 …
         do_action( 'groups_screen_group_admin_manage_members', $bp->groups->current_group->id );
         if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
             bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/single/admin' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/single/admin' ) );
         else
             bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/admin/manage-members' ) );
 …
 function groups_screen_group_admin_requests() {
     global $bp;
     if ( $bp->current_component == $bp->groups->slug && 'membership-requests' == $bp->action_variables[0] ) {
         if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
             return false;
         // Remove any screen notifications
         bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'new_membership_request' );
         $request_action = $bp->action_variables[1];
         $membership_id = $bp->action_variables[2];
 …
                 if ( !check_admin_referer( 'groups_accept_membership_request' ) )
                     return false;
                 // Accept the membership request
                 if ( !groups_accept_membership_request( $membership_id ) ) {
 …
                 if ( !check_admin_referer( 'groups_reject_membership_request' ) )
                     return false;
                 // Reject the membership request
                 if ( !groups_reject_membership_request( $membership_id ) ) {
 …
                 } else {
                     bp_core_add_message( __( 'Group membership request rejected', 'buddypress' ) );
+                }
+            }
+                }
+            }
             do_action( 'groups_group_request_managed', $bp->groups->current_group->id, $request_action, $membership_id );
 …
         if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
             bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/single/admin' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/single/admin' ) );
         else
             bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/admin/membership-requests' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/admin/membership-requests' ) );
+    }
+}
 …
 function groups_screen_group_admin_delete_group() {
     global $bp;
     if ( $bp->current_component == $bp->groups->slug && 'delete-group' == $bp->action_variables[0] ) {
         if ( !$bp->is_item_admin && !is_site_admin() )
             return false;
         if ( isset( $_REQUEST['delete-group-button'] ) && isset( $_REQUEST['delete-group-understand'] ) ) {
             /* Check the nonce first. */
             if ( !check_admin_referer( 'groups_delete_group' ) )
                 return false;
             // Group admin has deleted the group, now do it.
             if ( !groups_delete_group( $bp->groups->current_group->id ) ) {
 …
         if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
             bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/single/admin' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/single/admin' ) );
         else
             bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/admin/delete-group' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/admin/delete-group' ) );
+    }
+}
 add_action( 'wp', 'groups_screen_group_admin_delete_group', 4 );
 function groups_screen_notification_settings() {
+function groups_screen_notification_settings() {
     global $current_user; ?>
     <table class="notification-settings" id="groups-notification-settings">
 …
             <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
         <?php do_action( 'groups_screen_notification_settings' ); ?>
     </table>
 <?php
+<?php
+}
 add_action( 'bp_notification_settings', 'groups_screen_notification_settings' );
 …
 function groups_action_join_group() {
     global $bp;
     if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != 'join' )
         return false;
     // user wants to join a group
     if ( !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) && !groups_is_user_banned( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
 …
     if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
         bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
     else
         bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
 …
 function groups_action_sort_creation_steps() {
     global $bp;
     if ( $bp->current_component != BP_GROUPS_SLUG && $bp->current_action != 'create' )
         return false;
 …
     if ( !is_array( $bp->groups->group_creation_steps ) )
         return false;
     foreach ( $bp->groups->group_creation_steps as $slug => $step )
         $temp[$step['position']] = array( 'name' => $step['name'], 'slug' => $slug );
 …
     ksort($temp);
     unset($bp->groups->group_creation_steps);
     foreach( $temp as $position => $step )
         $bp->groups->group_creation_steps[$step['slug']] = array( 'name' => $step['name'], 'position' => $position );
 …
 function groups_aciton_redirect_to_random_group() {
     global $bp, $wpdb;
     if ( $bp->current_component == $bp->groups->slug && isset( $_GET['random-group'] ) ) {
         $group = groups_get_random_groups( 1, 1 );
 …
 function groups_register_activity_actions() {
     global $bp;
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
 …
 function groups_record_activity( $args = '' ) {
     global $bp;
     if ( !function_exists( 'bp_activity_add' ) )
         return false;
     /* If the group is not public, no recording of activity please. */
     if ( 'public' != $bp->groups->current_group->status )
         return false;
+    if ( 'public' != $bp->groups->current_group->status )
+        return false;
     $defaults = array(
         'user_id' => $bp->loggedin_user->id,
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
+    extract( $r, EXTR_SKIP );
     return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 …
 function groups_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
     global $bp;
     switch ( $action ) {
         case 'new_membership_request':
 …
             $group = new BP_Groups_Group( $group_id, false, false );
             $group_link = bp_get_group_permalink( $group );
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
+                return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
             } else {
                 $user_fullname = bp_core_get_user_displayname( $requesting_user_id );
                 return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . '/admin/membership-requests/" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
+            }
+            }
         break;
         case 'membership_request_accepted':
             $group_id = $item_id;
             $group = new BP_Groups_Group( $group_id, false, false );
             $group_link = bp_get_group_permalink( $group )  . '/?new';
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
+                return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
             } else {
                 return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            }
         break;
         case 'membership_request_rejected':
             $group_id = $item_id;
             $group = new BP_Groups_Group( $group_id, false, false );
             $group_link = bp_get_group_permalink( $group )  . '/?new';
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
+                return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
             } else {
                 return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            }
         break;
         case 'member_promoted_to_admin':
             $group_id = $item_id;
             $group = new BP_Groups_Group( $group_id, false, false );
             $group_link = bp_get_group_permalink( $group )  . '/?new';
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
             } else {
                 return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            }
         break;
         case 'member_promoted_to_mod':
             $group_id = $item_id;
             $group = new BP_Groups_Group( $group_id, false, false );
             $group_link = bp_get_group_permalink( $group )  . '/?new';
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
             } else {
                 return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
+            }
+            }
         break;
         case 'group_invite':
             $group_id = $item_id;
 …
             $group = new BP_Groups_Group( $group_id, false, false );
             $user_url = bp_core_get_userurl( $user_id );
             if ( (int)$total_items > 1 ) {
                 return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
             } else {
                 return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
+            }
+            }
         break;
+    }
     do_action( 'groups_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
     return false;
+}
 …
 function groups_create_group( $args = '' ) {
     global $bp;
     extract( $args );
     /**
      * Possible parameters (pass as assoc array):
 …
     else
         $group = new BP_Groups_Group;
     if ( $creator_id ) {
         $group->creator_id = $creator_id;
 …
         $group->creator_id = $bp->loggedin_user->id;
+    }
     if ( isset( $name ) )
         $group->name = $name;
     if ( isset( $description ) )
         $group->description = $description;
     if ( isset( $news ) )
         $group->news = $news;
     if ( isset( $slug ) && groups_check_slug( $slug ) )
         $group->slug = $slug;
     if ( isset( $status ) ) {
         if ( groups_is_valid_status( $status ) )
             $group->status = $status;
+    }
     if ( isset( $enable_wire ) )
         $group->enable_wire = $enable_wire;
     else if ( !$group_id && !isset( $enable_wire ) )
         $group->enable_wire = 1;
     if ( isset( $enable_forum ) )
         $group->enable_forum = $enable_forum;
     else if ( !$group_id && !isset( $enable_forum ) )
         $group->enable_forum = 1;
     if ( isset( $date_created ) )
         $group->date_created = $date_created;
     if ( !$group->save() )
         return false;
 …
         $member->user_title = __( 'Group Admin', 'buddypress' );
         $member->is_confirmed = 1;
         $member->save();
+    }
 …
     if ( empty( $group_name ) || empty( $group_desc ) )
         return false;
     $group = new BP_Groups_Group( $group_id, false, false );
     $group->name = $group_name;
 …
         groups_notification_group_updated( $group->id );
+    }
     do_action( 'groups_details_updated', $group->id );
     return true;
+}
 …
 function groups_edit_group_settings( $group_id, $enable_wire, $enable_forum, $enable_photos, $photos_admin_only, $status ) {
     global $bp;
     $group = new BP_Groups_Group( $group_id, false, false );
     $group->enable_wire = $enable_wire;
 …
     $group->enable_photos = $enable_photos;
     $group->photos_admin_only = $photos_admin_only;
     /***
+    /***
      * Before we potentially switch the group status, if it has been changed to public
      * from private and there are outstanding membership requests, auto-accept those requests.
 …
     if ( 'private' == $group->status && 'public' == $status )
         groups_accept_all_pending_membership_requests( $group->id );
     /* Now update the status */
     $group->status = $status;
     if ( !$group->save() )
         return false;
     /* If forums have been enabled, and a forum does not yet exist, we need to create one. */
     if ( $group->enable_forum ) {
 …
+        }
+    }
     do_action( 'groups_settings_updated', $group->id );
     return true;
+}
 …
 function groups_delete_group( $group_id ) {
     global $bp;
     // Check the user is the group admin.
     if ( !$bp->is_item_admin )
         return false;
     // Get the group object
     $group = new BP_Groups_Group( $group_id );
     if ( !$group->delete() )
         return false;
 …
         bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component_name' => $bp->groups->id ) );
+    }
     // Remove all outstanding invites for this group
     groups_delete_all_group_invites( $group_id );
 …
     // Remove all notifications for any user belonging to this group
     bp_core_delete_all_notifications_by_type( $group_id, $bp->groups->slug );
     do_action( 'groups_delete_group', $group_id );
     return true;
+}
 …
 function groups_is_valid_status( $status ) {
     global $bp;
     return in_array( $status, (array)$bp->groups->valid_status );
+}
 …
     if ( 'wp' == substr( $slug, 0, 2 ) )
         $slug = substr( $slug, 2, strlen( $slug ) - 2 );
     if ( in_array( $slug, (array)$bp->groups->forbidden_names ) ) {
         $slug = $slug . '-' . rand();
+    }
     if ( BP_Groups_Group::check_slug( $slug ) ) {
         do {
 …
         while ( BP_Groups_Group::check_slug( $slug ) );
+    }
     return $slug;
+}
 …
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     // Admins cannot leave a group, that is until promotion to admin support is implemented.
     if ( groups_is_user_admin( $user_id, $group_id ) )
         return false;
     // This is exactly the same as deleting and invite, just is_confirmed = 1 NOT 0.
     if ( !groups_uninvite_user( $user_id, $group_id, true ) )
 …
     /* Modify group member count */
     groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') - 1 );
     return true;
+}
 …
 function groups_join_group( $group_id, $user_id = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
 …
     if ( groups_check_user_has_invite( $user_id, $group_id ) )
         groups_delete_invite( $user_id, $group_id );
     $new_member = new BP_Groups_Member;
     $new_member->group_id = $group_id;
 …
     $new_member->date_modified = time();
     $new_member->is_confirmed = 1;
     if ( !$new_member->save() )
         return false;
 …
     /* Record this in activity streams */
     groups_record_activity( array(
         'content' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
+        'content' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
         'primary_link' => apply_filters( 'groups_activity_joined_group_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
         'component_action' => 'joined_group',
 …
 function groups_get_alphabetically( $limit = null, $page = 1 ) {
     return BP_Groups_Group::get_alphabetically( $limit, $page );
+    return BP_Groups_Group::get_alphabetically( $limit, $page );
+}
 …
 function groups_get_user_groups( $user_id = false, $pag_num = false, $pag_page = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_group_ids( $user_id, $pag_num, $pag_page );
+}
 …
 function groups_get_recently_joined_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
 …
 function groups_get_most_popular_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_most_popular( $user_id, $pag_num, $pag_page, $filter );
+    return BP_Groups_Member::get_most_popular( $user_id, $pag_num, $pag_page, $filter );
+}
 function groups_get_recently_active_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_recently_active( $user_id, $pag_num, $pag_page, $filter );
+}
 …
 function groups_get_alphabetically_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_alphabetically( $user_id, $pag_num, $pag_page, $filter );
+    return BP_Groups_Member::get_alphabetically( $user_id, $pag_num, $pag_page, $filter );
+}
 function groups_get_user_is_admin_of( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_is_admin_of( $user_id, $pag_num, $pag_page, $filter );
+    return BP_Groups_Member::get_is_admin_of( $user_id, $pag_num, $pag_page, $filter );
+}
 function groups_get_user_is_mod_of( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_is_mod_of( $user_id, $pag_num, $pag_page, $filter );
+    return BP_Groups_Member::get_is_mod_of( $user_id, $pag_num, $pag_page, $filter );
+}
 function groups_total_groups_for_user( $user_id = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::total_group_count( $user_id );
+}
 …
 function groups_get_random_groups_for_user( $user_id = false, $total_groups = 5 ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_random_groups( $user_id, $total_groups );
+}
 …
     if ( !$group_id )
         $group_id = $bp->groups->current_group->id;
     $path  = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
     $newdir = WP_CONTENT_DIR . str_replace( 'wp-content', '', $path );
 …
     $newbdir = $newdir;
     if ( !file_exists( $newdir ) )
         @wp_mkdir_p( $newdir );
 …
     $newsubdir = '/group-avatars/' . $group_id;
     return apply_filters( 'groups_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+    return apply_filters( 'groups_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+}
 …
 function groups_new_wire_post( $group_id, $content ) {
     global $bp;
     if ( !function_exists( 'bp_wire_new_post' ) )
         return false;
     if ( $wire_post = bp_wire_new_post( $group_id, $content, 'groups' ) ) {
         /* Post an email notification if settings allow */
         require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
         groups_notification_new_wire_post( $group_id, $wire_post->id );
         /* Record this in activity streams */
         $activity_content = sprintf( __( '%s wrote on the wire of the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $content ) ) . '</blockquote>';
         groups_record_activity( array(
             'content' => apply_filters( 'groups_activity_new_wire_post', $activity_content ),
+            'content' => apply_filters( 'groups_activity_new_wire_post', $activity_content ),
             'primary_link' => apply_filters( 'groups_activity_new_wire_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
             'component_action' => 'new_wire_post',
 …
         do_action( 'groups_new_wire_post', $group_id, $wire_post->id );
         return true;
+    }
     return false;
+}
 …
             bp_activity_delete_by_item_id( array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post' ) );
+        }
         do_action( 'groups_deleted_wire_post', $wire_post_id );
         return true;
+    }
     return false;
+}
 …
     if ( !$group_id )
         $group_id = $bp->groups->current_group->id;
     if ( !$group_name )
         $group_name = $bp->groups->current_group->name;
     if ( !$group_desc )
         $group_desc = $bp->groups->current_group->description;
     $forum_id = bp_forums_new_forum( array( 'forum_name' => $group_name, 'forum_desc' => $group_desc ) );
     groups_update_groupmeta( $group_id, 'forum_id', $forum_id );
     do_action( 'groups_new_group_forum', $forum, $group_id );
+}
 …
 function groups_new_group_forum_post( $post_text, $topic_id ) {
     global $bp;
     if ( empty( $post_text ) )
         return false;
     if ( $forum_post = bp_forums_insert_post( array( 'post_text' => $post_text, 'topic_id' => $topic_id ) ) ) {
         $topic = bp_forums_get_topic_details( $topic_id );
         $activity_content = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $post_text ) ) . '</blockquote>';
         /* Record this in activity streams */
         groups_record_activity( array(
             'content' => apply_filters( 'groups_activity_new_forum_post', $activity_content, $post_text, &$topic, &$forum_post ),
+            'content' => apply_filters( 'groups_activity_new_forum_post', $activity_content, $post_text, &$topic, &$forum_post ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
             'component_action' => 'new_forum_post',
 …
         do_action( 'groups_new_forum_topic_post', $bp->groups->current_group->id, $forum_post );
         return $forum_post;
+    }
     return false;
+}
 …
 function groups_new_group_forum_topic( $topic_title, $topic_text, $topic_tags, $forum_id ) {
     global $bp;
     if ( empty( $topic_title ) || empty( $topic_text ) )
         return false;
     if ( $topic_id = bp_forums_new_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_tags' => $topic_tags, 'forum_id' => $forum_id ) ) ) {
         $topic = bp_forums_get_topic_details( $topic_id );
 …
         $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $topic_text ) ) . '</blockquote>';
         /* Record this in activity streams */
         groups_record_activity( array(
             'content' => apply_filters( 'groups_activity_new_forum_topic', $activity_content, $topic_text, &$topic ),
+            'content' => apply_filters( 'groups_activity_new_forum_topic', $activity_content, $topic_text, &$topic ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
             'component_action' => 'new_forum_topic',
 …
             'secondary_item_id' => $topic->topic_id
         ) );
         do_action( 'groups_new_forum_topic', $bp->groups->current_group->id, &$topic );
         return $topic;
+    }
     return false;
+}
 …
 function groups_update_group_forum_topic( $topic_id, $topic_title, $topic_text ) {
     global $bp;
     if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id ) ) ) {
         /* Update the activity stream item */
         if ( function_exists( 'bp_activity_delete_by_item_id' ) )
             bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_topic' ) );
         $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $topic_text ) ) . '</blockquote>';
 …
         /* Record this in activity streams */
         groups_record_activity( array(
             'content' => apply_filters( 'groups_activity_new_forum_topic', $activity_content, $topic_text, &$topic ),
+            'content' => apply_filters( 'groups_activity_new_forum_topic', $activity_content, $topic_text, &$topic ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_topic_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
             'component_action' => 'new_forum_topic',
 …
         do_action( 'groups_update_group_forum_topic', &$topic );
         return true;
+    }
     return false;
+}
 …
 function groups_update_group_forum_post( $post_id, $post_text, $topic_id ) {
     global $bp;
     $post = bp_forums_get_post( $post_id );
     if ( $post_id = bp_forums_insert_post( array( 'post_id' => $post_id, 'post_text' => $post_text, 'post_time' => $post->post_time, 'topic_id' => $topic_id, 'poster_id' => $post->poster_id ) ) ) {
         $topic = bp_forums_get_topic_details( $topic_id );
 …
         if ( function_exists( 'bp_activity_delete_by_item_id' ) )
             bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_post' ) );
         $activity_content = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $post_text ) ) . '</blockquote>';
         /* Record this in activity streams */
         groups_record_activity( array(
             'content' => apply_filters( 'groups_activity_new_forum_post', $activity_content, $post_text, &$topic, &$forum_post ),
+            'content' => apply_filters( 'groups_activity_new_forum_post', $activity_content, $post_text, &$topic, &$forum_post ),
             'primary_link' => apply_filters( 'groups_activity_new_forum_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
             'component_action' => 'new_forum_post',
 …
         do_action( 'groups_update_group_forum_post', &$post, &$topic );
         return true;
+    }
     return false;
+}
 …
 function groups_delete_group_forum_topic( $topic_id ) {
     global $bp;
     if ( bp_forums_delete_topic( array( 'topic_id' => $topic_id ) ) ) {
         /* Delete the activity stream item */
 …
         do_action( 'groups_delete_group_forum_topic', $topic_id );
         return true;
+    }
     return false;
+}
 …
 function groups_delete_group_forum_post( $post_id, $topic_id ) {
     global $bp;
     if ( bp_forums_delete_post( array( 'post_id' => $post_id ) ) ) {
         /* Delete the activity stream item */
 …
         do_action( 'groups_delete_group_forum_post', $post_id, $topic_id );
         return true;
+    }
     return false;
+}
 …
 function groups_get_invites_for_user( $user_id = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     return BP_Groups_Member::get_invites( $user_id );
+}
 …
 function groups_invite_user( $args = '' ) {
     global $bp;
     $defaults = array(
         'user_id' => false,
 …
     $args = wp_parse_args( $args, $defaults );
     extract( $args, EXTR_SKIP );
+    extract( $args, EXTR_SKIP );
     if ( !$user_id || !$group_id )
         return false;
     if ( groups_is_user_member( $user_id, $group_id ) )
         return false;
     $invite = new BP_Groups_Member;
     $invite->group_id = $group_id;
 …
     $invite->inviter_id = $inviter_id;
     $invite->is_confirmed = $is_confirmed;
     if ( !$invite->save() )
         return false;
     do_action( 'groups_invite_user', $args );
     return true;
+}
 …
 function groups_uninvite_user( $user_id, $group_id ) {
     global $bp;
     if ( !BP_Groups_Member::delete( $user_id, $group_id ) )
         return false;
 …
     if ( groups_is_user_member( $user_id, $group_id ) )
         return false;
     $member = new BP_Groups_Member( $user_id, $group_id );
     $member->accept_invite();
     if ( !$member->save() )
         return false;
+    if ( !$member->save() )
+        return false;
     do_action( 'groups_accept_invite', $user_id, $group_id );
     return true;
 …
     if ( !BP_Groups_Member::delete( $user_id, $group_id ) )
         return false;
     do_action( 'groups_reject_invite', $user_id, $group_id );
     return true;
+}
 …
 function groups_delete_invite( $user_id, $group_id ) {
     global $bp;
     $delete = BP_Groups_Member::delete_invite( $user_id, $group_id );
     if ( $delete )
         bp_core_delete_notifications_for_user_by_item_id( $user_id, $group_id, $bp->groups->slug, 'group_invite' );
     return $delete;
+}
 …
 function groups_send_invites( $user_id, $group_id ) {
     global $bp;
     require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
 …
         // Send the actual invite
         groups_notification_group_invites( $group, $member, $user_id );
         $member->invite_sent = 1;
         $member->save();
+    }
     do_action( 'groups_send_invites', $bp->groups->current_group->id, $invited_users );
+}
 …
 function groups_promote_member( $user_id, $group_id, $status ) {
     global $bp;
     if ( !$bp->is_item_admin )
         return false;
     $member = new BP_Groups_Member( $user_id, $group_id );
     do_action( 'groups_premote_member', $user_id, $group_id, $status );
     return $member->promote( $status );
+}
 …
     $member = new BP_Groups_Member( $user_id, $group_id );
     do_action( 'groups_demote_member', $user_id, $group_id );
 …
     if ( !$bp->is_item_admin )
         return false;
     $member = new BP_Groups_Member( $user_id, $group_id );
     do_action( 'groups_ban_member', $user_id, $group_id );
     return $member->ban();
+}
 …
 function groups_unban_member( $user_id, $group_id ) {
     global $bp;
     if ( !$bp->is_item_admin )
         return false;
     $member = new BP_Groups_Member( $user_id, $group_id );
     do_action( 'groups_unban_member', $user_id, $group_id );
     return $member->unban();
+}
 …
     $requesting_user->is_confirmed = 0;
     $requesting_user->comments = $_POST['group-request-membership-comments'];
     if ( $requesting_user->save() ) {
         $admins = groups_get_group_admins( $group_id );
 …
             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 );
         return true;
+    }
     return false;
+}
 …
 function groups_accept_membership_request( $membership_id, $user_id = false, $group_id = false ) {
     global $bp;
     if ( $user_id && $group_id )
         $membership = new BP_Groups_Member( $user_id, $group_id );
 …
     $membership->accept_request();
     if ( !$membership->save() )
         return false;
     /* Modify group member count */
     groups_update_groupmeta( $membership->group_id, 'total_member_count', (int) groups_get_groupmeta( $membership->group_id, 'total_member_count') + 1 );
     /* Record this in activity streams */
     $group = new BP_Groups_Group( $group_id, false, false );
     groups_record_activity( array(
         'content' => apply_filters( 'groups_activity_membership_accepted', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $user_id, &$group ),
+        'content' => apply_filters( 'groups_activity_membership_accepted', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $user_id, &$group ),
         'primary_link' => apply_filters( 'groups_activity_membership_accepted_primary_link', bp_get_group_permalink( $group ), &$group ),
         'component_action' => 'joined_group',
 …
     require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
     groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, true );
     do_action( 'groups_membership_accepted', $membership->user_id, $membership->group_id );
     return true;
+}
 function groups_reject_membership_request( $membership_id, $user_id = false, $group_id = false ) {
+function groups_reject_membership_request( $membership_id, $user_id = false, $group_id = false ) {
     if ( $user_id && $group_id )
         $membership = new BP_Groups_Member( $user_id, $group_id );
     else
         $membership = new BP_Groups_Member( false, false, $membership_id );
     if ( !BP_Groups_Member::delete( $membership->user_id, $membership->group_id ) )
         return false;
     // Send a notification to the user.
     require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
     groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, false );
     do_action( 'groups_membership_rejected', $membership->user_id, $membership->group_id );
     return true;
+}
 …
     if ( !$user_ids )
         return false;
     foreach ( (array) $user_ids as $user_id ) {
         groups_accept_membership_request( false, $user_id, $group_id );
+    }
     do_action( 'groups_accept_all_pending_membership_requests', $group_id );
     return true;
+}
 …
 function groups_delete_groupmeta( $group_id, $meta_key = false, $meta_value = false ) {
     global $wpdb, $bp;
     if ( !is_numeric( $group_id ) )
         return false;
     $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
     if ( is_array($meta_value) || is_object($meta_value) )
         $meta_value = serialize($meta_value);
     $meta_value = trim( $meta_value );
     if ( !$meta_key ) {
         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d", $group_id ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d", $group_id ) );
     } else if ( $meta_value ) {
         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s AND meta_value = %s", $group_id, $meta_key, $meta_value ) );
 …
         $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
+    }
     // TODO need to look into using this.
     // wp_cache_delete($group_id, 'groups');
 …
 function groups_get_groupmeta( $group_id, $meta_key = '') {
     global $wpdb, $bp;
     $group_id = (int) $group_id;
 …
     if ( !empty($meta_key) ) {
         $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
         // TODO need to look into using this.
         //$user = wp_cache_get($user_id, 'users');
         // Check the cached user object
         //if ( false !== $user && isset($user->$meta_key) )
 …
 function groups_update_groupmeta( $group_id, $meta_key, $meta_value ) {
     global $wpdb, $bp;
     if ( !is_numeric( $group_id ) )
         return false;
     $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
     if ( is_string($meta_value) )
         $meta_value = stripslashes($wpdb->escape($meta_value));
     $meta_value = maybe_serialize($meta_value);
     if (empty($meta_value)) {
         return groups_delete_groupmeta( $group_id, $meta_key );
 …
 function groups_remove_data_for_user( $user_id ) {
     BP_Groups_Member::delete_all_for_user($user_id);
     do_action( 'groups_remove_data_for_user', $user_id );
+}

trunk/bp-groups/bp-groups-admin.php

-                      r1905
+                      r2077
 <?php
 function groups_admin_settings() {
+function groups_admin_settings() {
     if ( isset( $_POST['groups_admin_delete']) && isset( $_POST['allgroups'] ) ) {
         if ( !check_admin_referer('bp-groups-admin') )
             return false;
         $errors = false;
         foreach ( $_POST['allgroups'] as $group_id ) {
 …
+            }
+        }
         if ( $errors ) {
             $message = __( 'There were errors when deleting groups, please try again', 'buddypress' );
 …
     <div class="wrap" style="position: relative">
         <h2><?php _e( 'Groups', 'buddypress' ) ?></h2>
         <form id="wpmu-search" method="post" action="">
             <input type="text" size="17" value="<?php echo attribute_escape( stripslashes( $_REQUEST['s'] ) ); ?>" name="s" />
             <input id="post-query-submit" class="button" type="submit" value="<?php _e( 'Search Groups', 'buddypress' ) ?>" />
         </form>
         <?php if ( bp_has_site_groups( 'type=active&per_page=10' ) ) : ?>
             <form id="bp-group-admin-list" method="post" action="">
 …
                     </div>
                 </div>
                 <br class="clear"/>
                 <?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] != '' ) { ?>
                     <p><?php echo sprintf( __( 'Groups matching: "%s"', 'buddypress' ), $_REQUEST['s'] ) ?></p>
 …
                     <?php endwhile; ?>
                     </tbody>
                 </table>
+                </table>
         <?php else: ?>
 …
         </form>
     </div>
 <?php
+<?php
+}

trunk/bp-groups/bp-groups-classes.php

-                      r2055
+                      r2077
     var $user_dataset;
     var $admins;
     var $total_member_count;
     var $random_members;
     var $latest_wire_posts;
     function bp_groups_group( $id = null, $single = false, $get_user_dataset = true ) {
         if ( $id ) {
 …
             $this->populate( $get_user_dataset );
+        }
         if ( $single ) {
             $this->populate_meta();
+        }
+    }
     function populate( $get_user_dataset ) {
         global $wpdb, $bp;
 …
         $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} WHERE id = %d", $this->id );
         $group = $wpdb->get_row($sql);
         if ( $group ) {
             $this->id = $group->id;
 …
             $this->date_created = strtotime($group->date_created);
             $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
             if ( $get_user_dataset ) {
                 $this->user_dataset = $this->get_user_dataset();
                 //if ( !$this->total_member_count ) {
                 $this->total_member_count = count( $this->user_dataset );
 …
                 //}
+            }
+        }
+    }
+        }
+    }
     function populate_meta() {
         if ( $this->id ) {
 …
+        }
+    }
     function save() {
         global $wpdb, $bp;
         $this->creator_id = apply_filters( 'groups_group_creator_id_before_save', $this->creator_id, $this->id );
         $this->name = apply_filters( 'groups_group_name_before_save', $this->name, $this->id );
 …
         do_action( 'groups_group_before_save', $this );
         if ( $this->id ) {
             $sql = $wpdb->prepare(
                 "UPDATE {$bp->groups->table_name} SET
                     creator_id = %d,
                     name = %s,
                     slug = %s,
                     description = %s,
                     news = %s,
                     status = %s,
                     enable_wire = %d,
                     enable_forum = %d,
+            $sql = $wpdb->prepare(
+                "UPDATE {$bp->groups->table_name} SET
+                    creator_id = %d,
+                    name = %s,
+                    slug = %s,
+                    description = %s,
+                    news = %s,
+                    status = %s,
+                    enable_wire = %d,
+                    enable_forum = %d,
                     date_created = FROM_UNIXTIME(%d)
                 WHERE
                     id = %d
                 ",
                     $this->creator_id,
                     $this->name,
                     $this->slug,
                     $this->description,
                     $this->news,
                     $this->status,
                     $this->enable_wire,
                     $this->enable_forum,
+                    $this->creator_id,
+                    $this->name,
+                    $this->slug,
+                    $this->description,
+                    $this->news,
+                    $this->status,
+                    $this->enable_wire,
+                    $this->enable_forum,
                     $this->date_created,
                     $this->id
             );
         } else {
             $sql = $wpdb->prepare(
                 "INSERT INTO {$bp->groups->table_name} (
+            $sql = $wpdb->prepare(
+                "INSERT INTO {$bp->groups->table_name} (
                     creator_id,
                     name,
 …
                     %d, %s, %s, %s, %s, %s, %d, %d, FROM_UNIXTIME(%d)
                 )",
                     $this->creator_id,
                     $this->name,
                     $this->slug,
                     $this->description,
                     $this->news,
                     $this->status,
                     $this->enable_wire,
+                    $this->creator_id,
+                    $this->name,
+                    $this->slug,
+                    $this->description,
+                    $this->news,
+                    $this->status,
+                    $this->enable_wire,
                     $this->enable_forum,
                     $this->date_created
             );
+        }
         if ( false === $wpdb->query($sql) )
             return false;
         if ( !$this->id ) {
             $this->id = $wpdb->insert_id;
 …
         do_action( 'groups_group_after_save', $this );
         return true;
+    }
     function get_user_dataset() {
         global $wpdb, $bp;
         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id, is_admin, inviter_id, user_title, is_mod FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 AND is_banned = 0 ORDER BY rand()", $this->id ) );
+    }
     function get_administrators() {
         for ( $i = 0; $i < count($this->user_dataset); $i++ ) {
             if ( $this->user_dataset[$i]->is_admin )
                 $admins[] = new BP_Groups_Member( $this->user_dataset[$i]->user_id, $this->id );
+        }
+        }
         return $admins;
+    }
 …
     function get_random_members() {
         $total_randoms = ( $this->total_member_count > 5 ) ? 5 : $this->total_member_count;
         for ( $i = 0; $i < $total_randoms; $i++ ) {
             if ( !(int)$this->user_dataset[$i]->is_banned )
 …
         return $users;
+    }
     function is_member() {
         global $bp;
         for ( $i = 0; $i < count($this->user_dataset); $i++ ) {
             if ( $this->user_dataset[$i]->user_id == $bp->loggedin_user->id ) {
                 return true;
+            }
+        }
+        }
         return false;
+    }
     function delete() {
         global $wpdb, $bp;
         // Delete groupmeta for the group
         groups_delete_groupmeta( $this->id );
 …
         for ( $i = 0; $i < count($this->user_dataset); $i++ ) {
             $user = $this->user_dataset[$i];
             $total_count = get_usermeta( $user->user_id, 'total_group_count' );
             if ( $total_count != '' ) {
                 update_usermeta( $user->user_id, 'total_group_count', (int)$total_count - 1 );
+            }
             // Now delete the group member record
             BP_Groups_Member::delete( $user->user_id, $this->id, false );
+        }
         // Delete the wire posts for this group if the wire is installed
         if ( function_exists('bp_wire_install') ) {
             BP_Wire_Post::delete_all_for_item( $this->id, $bp->groups->table_name_wire );
+        }
         // Finally remove the group entry from the DB
         if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name} WHERE id = %d", $this->id ) ) )
 …
         return true;
+    }
     /* Static Functions */
     function group_exists( $slug, $table_name = false ) {
         global $wpdb, $bp;
         if ( !$table_name )
             $table_name = $bp->groups->table_name;
         if ( !$slug )
             return false;
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$table_name} WHERE slug = %s", $slug ) );
+    }
 …
         return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d and is_confirmed = 0 AND inviter_id = %d", $group_id, $user_id ) );
+    }
     function filter_user_groups( $filter, $user_id = false, $order = false, $limit = null, $page = null ) {
         global $wpdb, $bp;
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         $filter = like_escape( $wpdb->escape( $filter ) );
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         // Get all the group ids for the current user's groups.
         $gids = BP_Groups_Member::get_group_ids( $user_id );
         if ( !$gids['groups'] )
             return false;
         $gids = implode( ',', $gids['groups'] );
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids}) {$pag_sql}" ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids})" ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function search_groups( $filter, $limit = null, $page = null, $sort_by = false, $order = false ) {
         global $wpdb, $bp;
         $filter = like_escape( $wpdb->escape( $filter ) );
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
             $order_sql = "ORDER BY $sort_by $order";
+        }
         if ( !is_site_admin() )
             $hidden_sql = "AND status != 'hidden'";
 …
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE ( name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' ) {$hidden_sql} {$order_sql} {$pag_sql}" ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name} WHERE ( name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' ) {$hidden_sq}" ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function check_slug( $slug ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM {$bp->groups->table_name} WHERE slug = %s", $slug ) );
+    }
+        return $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM {$bp->groups->table_name} WHERE slug = %s", $slug ) );
+    }
     function get_slug( $group_id ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM {$bp->groups->table_name} WHERE id = %d", $group_id ) );
+    }
+        return $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM {$bp->groups->table_name} WHERE id = %d", $group_id ) );
+    }
     function has_members( $group_id ) {
         global $wpdb, $bp;
         $members = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d", $group_id ) );
+        $members = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d", $group_id ) );
         if ( !$members )
             return false;
         return true;
+    }
     function has_membership_requests( $group_id ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0", $group_id ) );
+    }
+        return $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0", $group_id ) );
+    }
     function get_membership_requests( $group_id, $limit = null, $page = null ) {
         global $wpdb, $bp;
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        }
         $paged_requests = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0{$pag_sql}", $group_id ) );
         $total_requests = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
 …
         return array( 'requests' => $paged_requests, 'total' => $total_requests );
+    }
     function get_newest( $limit = null, $page = null ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( !is_site_admin() )
             $hidden_sql = "WHERE status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY date_created DESC {$pag_sql}" ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY date_created DESC", $limit ) );
 …
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_active( $limit = null, $page = null ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         if ( !is_site_admin() )
             $hidden_sql = "AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
 …
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_popular( $limit = null, $page = null ) {
         global $wpdb, $bp;
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         if ( !is_site_admin() )
             $hidden_sql = "AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT gm.group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(gm.group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
 …
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_alphabetically( $limit = null, $page = null ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( !is_site_admin() )
             $hidden_sql = "WHERE status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY name ASC {$pag_sql}" ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY name ASC", $limit ) );
 …
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_by_most_forum_topics( $limit = null, $page = null ) {
         global $wpdb, $bp, $bbdb;
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT COUNT(gm.group_id) FROM {$bbdb->forums} AS f, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) AND g.status = 'public' ORDER BY f.topics DESC" ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_by_most_forum_posts( $limit = null, $page = null ) {
         global $wpdb, $bp, $bbdb;
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        }
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT gm.group_id FROM {$bbdb->forums} AS f, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) AND g.status = 'public' ORDER BY f.posts DESC {$pag_sql}" ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT COUNT(gm.group_id) FROM {$bbdb->forums} AS f, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) AND g.status = 'public' ORDER BY f.posts DESC" ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_all( $limit = null, $page = null, $only_public = true, $sort_by = false, $order = false ) {
         global $wpdb, $bp;
         if ( $only_public )
             $public_sql = $wpdb->prepare( " WHERE g.status = 'public'" );
         if ( !is_site_admin() )
             $hidden_sql = $wpdb->prepare( " AND g.status != 'hidden'");
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( $sort_by && $order ) {
             $sort_by = $wpdb->escape( $sort_by );
             $order = $wpdb->escape( $order );
             $order_sql = "ORDER BY g.$sort_by $order";
             switch ( $sort_by ) {
                 default:
                     $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
                     break;
                 case 'members':
                     $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'total_member_count' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'total_member_count' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
                     break;
                 case 'last_active':
                     $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'last_activity' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'last_activity' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
                     break;
+            }
         } else {
             $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
+        }
+            $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
+        }
         return $wpdb->get_results($sql);
+    }
     function get_by_letter( $letter, $limit = null, $page = null ) {
         global $wpdb, $bp;
         if ( strlen($letter) > 1 || is_numeric($letter) || !$letter )
             return false;
         if ( !is_site_admin() )
             $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
         $letter = like_escape( $wpdb->escape( $letter ) );
 …
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name} WHERE name LIKE '$letter%%' {$hidden_sql} ORDER BY name ASC" ) );
+        }
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE name LIKE '$letter%%' {$hidden_sql} ORDER BY name ASC {$pag_sql}" ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_random( $limit = null, $page = null ) {
         global $wpdb, $bp;
 …
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT id as group_id, slug FROM {$bp->groups->table_name} WHERE status = 'public' {$hidden_sql} ORDER BY rand()" ) );
+        }
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id, slug FROM {$bp->groups->table_name} WHERE status = 'public' {$hidden_sql} ORDER BY rand() {$pag_sql}" ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id, slug FROM {$bp->groups->table_name} WHERE status = 'public' {$hidden_sql} ORDER BY rand() {$pag_sql}" ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function delete_all_invites( $group_id ) {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE group_id = %d AND invite_sent = 1", $group_id ) );
+    }
     function get_global_forum_topic_count( $type ) {
         global $bbdb, $wpdb, $bp;
         if ( 'unreplied' == $type )
             $bp->groups->filter_sql = ' AND t.topic_posts = 1';
         $extra_sql = apply_filters( 'groups_total_public_forum_topic_count', $bp->groups->filter_sql, $type );
 …
     var $comments;
     var $invite_sent;
     var $user;
     function bp_groups_member( $user_id = false, $group_id = false, $id = false, $populate = true ) {
         if ( $user_id && $group_id && !$id ) {
             $this->user_id = $user_id;
             $this->group_id = $group_id;
             if ( $populate )
                 $this->populate();
+        }
         if ( $id ) {
             $this->id = $id;
             if ( $populate )
                 $this->populate();
+        }
+    }
+        }
+    }
     function populate() {
         global $wpdb, $bp;
         if ( $this->user_id && $this->group_id && !$this->id )
             $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $this->user_id, $this->group_id );
         if ( $this->id )
             $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name_members} WHERE id = %d", $this->id );
         $member = $wpdb->get_row($sql);
         if ( $member ) {
             $this->id = $member->id;
 …
             $this->comments = $member->comments;
             $this->invite_sent = $member->invite_sent;
             $this->user = new BP_Core_User( $this->user_id );
+        }
+    }
     function save() {
         global $wpdb, $bp;
         $this->user_id = apply_filters( 'groups_member_user_id_before_save', $this->user_id, $this->id );
         $this->group_id = apply_filters( 'groups_member_group_id_before_save', $this->group_id, $this->id );
 …
         $this->comments = apply_filters( 'groups_member_comments_before_save', $this->comments, $this->id );
         $this->invite_sent = apply_filters( 'groups_member_invite_sent_before_save', $this->invite_sent, $this->id );
         do_action( 'groups_member_before_save', $this );
         if ( $this->id ) {
             $sql = $wpdb->prepare( "UPDATE {$bp->groups->table_name_members} SET inviter_id = %d, is_admin = %d, is_mod = %d, is_banned = %d, user_title = %s, date_modified = FROM_UNIXTIME(%d), is_confirmed = %d, comments = %s, invite_sent = %d WHERE id = %d", $this->inviter_id, $this->is_admin, $this->is_mod, $this->is_banned, $this->user_title, $this->date_modified, $this->is_confirmed, $this->comments, $this->invite_sent, $this->id );
 …
         if ( !$wpdb->query($sql) )
             return false;
         $this->id = $wpdb->insert_id;
         do_action( 'groups_member_after_save', $this );
         return true;
+    }
     function promote( $status = 'mod' ) {
         if ( 'mod' == $status ) {
 …
             $this->user_title = __( 'Group Mod', 'buddypress' );
+        }
         if ( 'admin' == $status ) {
             $this->is_admin = 1;
 …
             $this->user_title = __( 'Group Admin', 'buddypress' );
+        }
         return $this->save();
+    }
     function demote() {
+    function demote() {
         $this->is_mod = 0;
         $this->is_admin = 0;
         $this->user_title = false;
         return $this->save();
+    }
+        return $this->save();
+    }
     function ban() {
         if ( $this->is_admin )
             return false;
+        if ( $this->is_admin )
+            return false;
         $this->is_mod = 0;
         $this->is_banned = 1;
         groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
         return $this->save();
+    }
+        return $this->save();
+    }
     function unban() {
         if ( $this->is_admin )
             return false;
+        if ( $this->is_admin )
+            return false;
         $this->is_banned = 0;
         groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) + 1 ) );
         return $this->save();
+    }
+        return $this->save();
+    }
     function accept_invite() {
         $this->inviter_id = 0;
 …
         $this->date_modified = time();
+    }
     function accept_request() {
         $this->is_confirmed = 1;
         $this->date_modified = time();
+    }
+        $this->date_modified = time();
+    }
     /* Static Functions */
 …
         $delete_result = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
         return $delete_result;
+    }
     function get_group_ids( $user_id, $limit = false, $page = false ) {
         global $wpdb, $bp;
 …
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         // If the user is logged in and viewing their own groups, we can show hidden and private groupss
         if ( bp_is_home() ) {
             $group_sql = $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0{$pag_sql}", $user_id );
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0", $user_id ) );
+            $group_sql = $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0{$pag_sql}", $user_id );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0", $user_id ) );
         } else {
             $group_sql = $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0{$pag_sql}", $user_id );
+            $group_sql = $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0{$pag_sql}", $user_id );
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        }
         $groups = $wpdb->get_col( $group_sql );
         return array( 'groups' => $groups, 'total' => (int) $total_groups );
+    }
     function get_recently_joined( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
 …
         if ( $filter ) {
             $filter = like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
         if ( !bp_is_home() )
             $hidden_sql = " AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY m.date_modified DESC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY m.date_modified DESC", $user_id ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY m.date_modified DESC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY m.date_modified DESC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_most_popular( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
 …
         if ( $filter ) {
             like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
 …
             $hidden_sql = " AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC", $user_id ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_recently_active( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( $filter ) {
             $filter = like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
         if ( !bp_is_home() )
             $hidden_sql = " AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY gm.meta_value DESC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY gm.meta_value DESC", $user_id ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY gm.meta_value DESC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY gm.meta_value DESC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_alphabetically( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         if ( $filter ) {
             $filter = like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
         if ( !bp_is_home() )
             $hidden_sql = " AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC", $user_id ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+            $hidden_sql = " AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_is_admin_of( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         if ( $filter ) {
             $filter = like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
         if ( !bp_is_home() )
             $hidden_sql = " AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY date_modified ASC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY date_modified ASC", $user_id ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+            $hidden_sql = " AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY date_modified ASC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY date_modified ASC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_is_mod_of( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 …
         if ( $filter ) {
             $filter = like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
         if ( !bp_is_home() )
             $hidden_sql = " AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_mod = 1 ORDER BY date_modified ASC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_mod = 1 ORDER BY date_modified ASC", $user_id ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+            $hidden_sql = " AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_mod = 1 ORDER BY date_modified ASC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_mod = 1 ORDER BY date_modified ASC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function total_group_count( $user_id = false ) {
         global $bp, $wpdb;
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         if ( bp_is_home() ) {
             return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0", $user_id ) );
+            return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(group_id) FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0", $user_id ) );
         } else {
             return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        }
+    }
+            return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        }
+    }
     function get_invites( $user_id ) {
         global $wpdb, $bp;
         $group_ids = $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d and is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id ) );
         return $group_ids;
+    }
     function check_has_invite( $user_id, $group_id ) {
         global $wpdb, $bp;
         if ( !$user_id )
             return false;
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
+    }
+        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
+    }
     function delete_invite( $user_id, $group_id ) {
         global $wpdb, $bp;
         if ( !$user_id )
             return false;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
+    }
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
+    }
     function check_is_admin( $user_id, $group_id ) {
         global $wpdb, $bp;
         if ( !$user_id )
             return false;
         return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_admin = 1 AND is_banned = 0", $user_id, $group_id ) );
+    }
     function check_is_mod( $user_id, $group_id ) {
         global $wpdb, $bp;
         if ( !$user_id )
             return false;
         return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_mod = 1 AND is_banned = 0", $user_id, $group_id ) );
+    }
     function check_is_member( $user_id, $group_id ) {
         global $wpdb, $bp;
         if ( !$user_id )
             return false;
         return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 1 AND is_banned = 0", $user_id, $group_id ) );
+    }
+        return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 1 AND is_banned = 0", $user_id, $group_id ) );
+    }
     function check_is_banned( $user_id, $group_id ) {
         global $wpdb, $bp;
         if ( !$user_id )
             return false;
         return $wpdb->get_var( $wpdb->prepare( "SELECT is_banned FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
+    }
     function check_for_membership_request( $user_id, $group_id ) {
         global $wpdb, $bp;
         if ( !$user_id )
             return false;
         return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND is_banned = 0 AND inviter_id = 0", $user_id, $group_id ) );
+    }
+        return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND is_banned = 0 AND inviter_id = 0", $user_id, $group_id ) );
+    }
     function get_random_groups( $user_id, $total_groups = 5 ) {
         global $wpdb, $bp;
         // If the user is logged in and viewing their random groups, we can show hidden and private groups
         if ( bp_is_home() ) {
             return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND is_confirmed = 1 AND is_banned = 0 ORDER BY rand() LIMIT $total_groups", $user_id ) );
         } else {
             return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY rand() LIMIT $total_groups", $user_id ) );
+        }
+    }
+            return $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0 ORDER BY rand() LIMIT $total_groups", $user_id ) );
+        }
+    }
     function get_group_administrator_ids( $group_id ) {
         global $bp, $wpdb;
         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_admin = 1 AND is_banned = 0", $group_id ) );
+    }
     function get_group_moderator_ids( $group_id ) {
         global $bp, $wpdb;
 …
         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_mod = 1 AND is_banned = 0", $group_id ) );
+    }
     function get_all_membership_request_user_ids( $group_id ) {
         global $bp, $wpdb;
         return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
+    }
+        return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
+    }
     function get_all_for_group( $group_id, $limit = false, $page = false, $exclude_admins_mods = true, $exclude_banned = true ) {
         global $bp, $wpdb;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( $exclude_admins_mods )
             $exclude_sql = $wpdb->prepare( "AND is_admin = 0 AND is_mod = 0" );
         if ( $exclude_banned )
             $banned_sql = $wpdb->prepare( " AND is_banned = 0" );
         $members = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} {$pag_sql}", $group_id ) );
         if ( !$members )
             return false;
         if ( !isset($pag_sql) )
+        if ( !isset($pag_sql) )
             $total_member_count = count($members);
         else
             $total_member_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(user_id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql}", $group_id ) );
         return array( 'members' => $members, 'count' => $total_member_count );
+    }
     function delete_all_for_user( $user_id ) {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d", $user_id ) );
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d", $user_id ) );
+    }
+}
 …
 /**
  * API for creating group extensions without having to hardcode the content into
  * the theme.
+ * the theme.
+ *
  * This class must be extended for each group extension and the following methods overridden:
+ *
+ *
  * BP_Group_Extension::widget_display(), BP_Group_Extension::display(),
  * BP_Group_Extension::edit_screen_save(), BP_Group_Extension::edit_screen(),
 …
     var $name = false;
     var $slug = false;
     /* Will this extension be visible to non-members of a group? Options: public/private */
     var $visibility = 'public';
     var $create_step_position = 81;
     var $nav_item_position = 81;
     var $enable_create_step = true;
     var $enable_nav_item = true;
     var $enable_edit_item = true;
     var $nav_item_name = false;
     var $display_hook = 'groups_custom_group_boxes';
     var $template_file = 'plugin-template';
     // Methods you should override
     function display() {
         die( 'function BP_Group_Extension::display() must be over-ridden in a sub-class.' );
+    }
     function widget_display() {
         die( 'function BP_Group_Extension::widget_display() must be over-ridden in a sub-class.' );
+    }
     function edit_screen() {
         die( 'function BP_Group_Extension::edit_screen() must be over-ridden in a sub-class.' );
+    }
     function edit_screen_save() {
         die( 'function BP_Group_Extension::edit_screen_save() must be over-ridden in a sub-class.' );
+    }
     function create_screen() {
         die( 'function BP_Group_Extension::create_screen() must be over-ridden in a sub-class.' );
+    }
     function create_screen_save() {
         die( 'function BP_Group_Extension::create_screen_save() must be over-ridden in a sub-class.' );
+    }
+        die( 'function BP_Group_Extension::create_screen_save() must be over-ridden in a sub-class.' );
+    }
     // Private Methods
     function _register() {
         global $bp;
 …
             /* Attach the group creation step display content action */
             add_action( 'groups_custom_create_steps', array( &$this, 'create_screen' ) );
             /* Attach the group creation step save content action */
             add_action( 'groups_create_group_step_save_' . $this->slug, array( &$this, 'create_screen_save' ) );
+        }
         /* Construct the admin edit tab for the new group extension */
         if ( $this->enable_edit_item ) {
             add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', 'if ( "' . attribute_escape( $this->slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . $bp->root_domain . '/' . $bp->groups->slug . '/{$group_slug}/admin/' . attribute_escape( $this->slug ) . '\">' . attribute_escape( $this->name ) . '</a></li>";' ), 10, 2 );
+            add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', 'if ( "' . attribute_escape( $this->slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . $bp->root_domain . '/' . $bp->groups->slug . '/{$group_slug}/admin/' . attribute_escape( $this->slug ) . '\">' . attribute_escape( $this->name ) . '</a></li>";' ), 10, 2 );
             /* Catch the edit screen and forward it to the plugin template */
 …
                 if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) ) {
                     bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );
+                    bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );
                 } else {
                     add_action( 'bp_template_content_header', create_function( '', 'echo "<ul class=\"content-header-nav\">"; bp_group_admin_tabs(); echo "</ul>";' ) );
                     add_action( 'bp_template_content', array( &$this, 'edit_screen' ) );
                     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+                    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+                }
+            }
 …
             if ( $this->enable_nav_item ) {
                 if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item )
                     bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ) . '/', 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
+                    bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ) . '/', 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
                 /* When we are viewing the extension display page, set the title and options title */
 …
+                }
+            }
             /* Hook the group home widget */
             if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
 …
+        }
+    }
     function _display_hook() {
         add_action( 'bp_template_content', array( &$this, 'display' ) );
 …
 function bp_register_group_extension( $group_extension_class ) {
     global $bp;
     if ( !class_exists( $group_extension_class ) )
         return false;
     /* Register the group extension on the plugins_loaded action so we have access to all plugins */
     add_action( 'plugins_loaded', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "wp", array( &$extension, "_register" ), 2 );' ) );

trunk/bp-groups/bp-groups-filters.php

-                      r2026
+                      r2077
 function groups_add_forum_privacy_sql() {
     global $bp;
     /* Only filter the forum SQL on group pages or on the forums directory */
     if ( ( $bp->groups->current_group && 'public' == $bp->groups->current_group->status ) || bp_is_directory() ) {
 …
 function groups_add_forum_where_sql( $sql ) {
     global $bp;
     $bp->groups->filter_sql = ' AND ' . $sql;
     return "(gm.meta_key = 'forum_id' AND gm.meta_value = t.forum_id) AND g.status = 'public' AND " . $sql;
 …
     if ( is_site_admin() )
         return true;
     if ( 'add_tag_to' == $cap )
         if ( $bp->groups->current_group->user_has_access ) return true;
     if ( 'manage_forums' == $cap && is_user_logged_in() )
         return true;
     return $value;
+}

trunk/bp-groups/bp-groups-notifications.php

-                      r1905
+                      r2077
 function groups_notification_new_wire_post( $group_id, $wire_post_id ) {
     global $bp;
     if ( !isset( $_POST['wire-post-email-notify'] ) )
         return false;
     $wire_post = new BP_Wire_Post( $bp->groups->table_name_wire, $wire_post_id );
     $group = new BP_Groups_Group( $group_id, false, true );
     $poster_name = bp_core_get_user_displayname( $wire_post->user_id );
     $poster_profile_link = bp_core_get_user_domain( $wire_post->user_id );
+    $poster_profile_link = bp_core_get_user_domain( $wire_post->user_id );
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New wire post on group: %s', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) );
 …
     foreach ( $group->user_dataset as $user ) {
         if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_wire_post' ) ) continue;
         $ud = get_userdata( $user->user_id );
         // Set up and send the message
         $to = $ud->user_email;
 …
         $wire_link = site_url( $bp->groups->slug . '/' . $group->slug . '/wire/' );
         $group_link = site_url( $bp->groups->slug . '/' . $group->slug . '/' );
         $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
         $message = sprintf( __(
+        $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
+        $message = sprintf( __(
 '%s posted on the wire of the group "%s":
 …
         // Send it
         wp_mail( $to, $subject, $message );
         unset( $message, $to );
+    }
 …
 function groups_notification_group_updated( $group_id ) {
     global $bp;
     $group = new BP_Groups_Group( $group_id, false, true );
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . __( 'Group Details Updated', 'buddypress' );
 …
     foreach ( $group->user_dataset as $user ) {
         if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_group_updated' ) ) continue;
         $ud = get_userdata( $user->user_id );
         // Set up and send the message
         $to = $ud->user_email;
 …
         $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
         $message = sprintf( __(
+        $message = sprintf( __(
 'Group details for the group "%s" were updated:
 …
     if ( 'no' == get_usermeta( $admin_id, 'notification_groups_membership_request' ) )
         return false;
     $requesting_user_name = bp_core_get_user_displayname( $requesting_user_id );
     $group = new BP_Groups_Group( $group_id, false, false );
     $ud = get_userdata($admin_id);
     $requesting_ud = get_userdata($requesting_user_id);
 …
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) );
 $message = sprintf( __(
+$message = sprintf( __(
 '%s wants to join the group "%s".
 …
     // Send it
     wp_mail( $to, $subject, $message );
+    wp_mail( $to, $subject, $message );
+}
 function groups_notification_membership_request_completed( $requesting_user_id, $group_id, $accepted = true ) {
     global $bp;
     // Post a screen notification first.
     if ( $accepted )
 …
     else
         bp_core_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
     if ( 'no' == get_usermeta( $requesting_user_id, 'notification_membership_request_completed' ) )
         return false;
     $group = new BP_Groups_Group( $group_id, false, false );
     $ud = get_userdata($requesting_user_id);
 …
     // Set up and send the message
     $to = $ud->user_email;
     if ( $accepted ) {
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) );
         $message = sprintf( __(
+        $message = sprintf( __(
 'Your membership request for the group "%s" has been accepted.
 …
 ---------------------
 ', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ), $group_link );
     } else {
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) );
         $message = sprintf( __(
+        $message = sprintf( __(
 'Your membership request for the group "%s" has been rejected.
 …
 ', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ), $group_link );
+    }
     $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     // Send it
     wp_mail( $to, $subject, $message );
+    wp_mail( $to, $subject, $message );
+}
 …
         $type = 'member_promoted_to_mod';
+    }
     // Post a screen notification first.
     bp_core_add_notification( $group_id, $user_id, 'groups', $type );
 …
     $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) );
     $message = sprintf( __(
+    $message = sprintf( __(
 'You have been promoted to %s for the group: "%s".
 …
 function groups_notification_group_invites( &$group, &$member, $inviter_user_id ) {
     global $bp;
     $inviter_ud = get_userdata( $inviter_user_id );
     $inviter_name = bp_core_get_userlink( $inviter_user_id, true, false, true );
     $inviter_link = bp_core_get_user_domain( $inviter_user_id );
     $group_link = bp_get_group_permalink( $group );
     if ( !$member->invite_sent ) {
         $invited_user_id = $member->user_id;
 …
         $invited_ud = get_userdata($invited_user_id);
         $settings_link = bp_core_get_user_domain( $invited_user_id ) . 'settings/notifications/';
         $invited_link = bp_core_get_user_domain( $invited_user_id );
 …
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) );
         $message = sprintf( __(
+        $message = sprintf( __(
 'One of your friends %s has invited you to the group: "%s".

trunk/bp-groups/bp-groups-templatetags.php

-                      r2055
+                      r2077
     <li<?php if ( 'admin-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
     <li<?php if ( 'mod-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
     <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
 <?php
     do_action( 'groups_header_tabs' );
 …
 function bp_groups_filter_title() {
     global $bp;
     $current_filter = $bp->action_variables[0];
     switch ( $current_filter ) {
         case 'recently-active': default:
 …
 function bp_is_group_admin_screen( $slug ) {
     global $bp;
     if ( $bp->current_component != BP_GROUPS_SLUG || 'admin' != $bp->current_action )
         return false;
     if ( $bp->action_variables[0] == $slug )
         return true;
     return false;
+}
 …
 function bp_group_current_avatar() {
     global $bp;
     if ( $bp->groups->current_group->avatar_full ) { ?>
         <img src="<?php echo attribute_escape( $bp->groups->current_group->avatar_full ) ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
 …
     if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
         return false;
     return true;
+}
 …
     function bp_get_group_avatar_delete_link() {
         global $bp;
         return apply_filters( 'bp_get_group_avatar_delete_link', wp_nonce_url( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/group-avatar/delete', 'bp_group_avatar_delete' ) );
+    }
 …
     var $groups;
     var $group;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_group_count;
     var $single_group = false;
     var $sort_by;
     var $order;
     function bp_groups_user_groups_template( $user_id, $type, $per_page, $max, $slug, $filter ) {
         global $bp;
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 …
             case 'popular':
                 $this->groups = groups_get_most_popular_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
+                $this->groups = groups_get_most_popular_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
             case 'admin-of':
                 $this->groups = groups_get_user_is_admin_of( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
+                $this->groups = groups_get_user_is_admin_of( $user_id, $this->pag_num, $this->pag_page, $filter );
+                break;
             case 'mod-of':
                 $this->groups = groups_get_user_is_mod_of( $user_id, $this->pag_num, $this->pag_page, $filter );
+                $this->groups = groups_get_user_is_mod_of( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
             case 'alphabetical':
                 $this->groups = groups_get_alphabetically_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
+                $this->groups = groups_get_alphabetically_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
 …
             case 'single-group':
                 $group = new stdClass;
                 $group->group_id = BP_Groups_Group::get_id_from_slug($slug);
+                $group->group_id = BP_Groups_Group::get_id_from_slug($slug);
                 $this->groups = array( $group );
                 break;
 …
                 break;
+        }
         if ( 'invites' == $type ) {
             $this->total_group_count = count($this->groups);
 …
         if ( $this->group_count )
             return true;
         return false;
+    }
     function next_group() {
         $this->current_group++;
         $this->group = $this->groups[$this->current_group];
         return $this->group;
+    }
     function rewind_groups() {
         $this->current_group = -1;
 …
+        }
+    }
     function user_groups() {
+    function user_groups() {
         if ( $this->current_group + 1 < $this->group_count ) {
             return true;
 …
         return false;
+    }
     function the_group() {
         global $group;
 …
         $this->in_the_loop = true;
         $this->group = $this->next_group();
         // If this is a single group then instantiate group meta when creating the object.
         if ( $this->single_group ) {
 …
+            }
+        }
         $this->group = $group;
         if ( 0 == $this->current_group ) // loop has just started
             do_action('loop_start');
 …
 function bp_has_groups( $args = '' ) {
     global $groups_template, $bp;
     $defaults = array(
         'type' => 'active',
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     /* The following code will auto set parameters based on the page being viewed.
      * for example on example.com/members/andy/groups/my-groups/most-popular/
 …
         $slug = $bp->groups->current_group->slug;
+    }
     if ( isset( $_REQUEST['group-filter-box'] ) )
         $filter = $_REQUEST['group-filter-box'];
     $groups_template = new BP_Groups_User_Groups_Template( $user_id, $type, $per_page, $max, $slug, $filter );
     return apply_filters( 'bp_has_groups', $groups_template->has_groups(), &$groups_template );
 …
 function bp_group_is_visible( $group = false ) {
     global $bp, $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     if ( 'public' == $group->status ) {
         return true;
 …
+        }
+    }
     return false;
+}
 …
 function bp_group_has_news( $group = false ) {
     global $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     if ( empty( $group->news ) )
         return false;
     return true;
+}
 …
         return apply_filters( 'bp_get_group_id', $group->id );
+    }
 function bp_group_name( $deprecated = true, $deprecated2 = false ) {
     global $groups_template;
 …
         if ( 'public' == $group->status ) {
             $type = __( "Public Group", "buddypress" );
         } else if ( 'hidden' == $group->status ) {
+        } else if ( 'hidden' == $group->status ) {
             $type = __( "Hidden Group", "buddypress" );
         } else if ( 'private' == $group->status ) {
 …
+        }
         return apply_filters( 'bp_get_group_type', $type );
+        return apply_filters( 'bp_get_group_type', $type );
+    }
 …
             $group =& $groups_template->group;
         return apply_filters( 'bp_get_group_status', $group->status );
+        return apply_filters( 'bp_get_group_status', $group->status );
+    }
 …
             'class' => 'avatar',
             'id' => false,
             'alt' => __( 'Group avatar', 'buddypress' )
+            'alt' => __( 'Group avatar', 'buddypress' )
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         /* Fetch the avatar from the folder, if not provide backwards compat. */
         if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height ) ) )
 …
         return bp_get_group_last_active();
     else
         echo bp_get_group_last_active();
+        echo bp_get_group_last_active();
+}
     function bp_get_group_last_active( $group = false ) {
 …
             return __( 'not yet active', 'buddypress' );
         } else {
             return apply_filters( 'bp_get_group_last_active', bp_core_time_since( $last_active ) );
+        }
+    }
+            return apply_filters( 'bp_get_group_last_active', bp_core_time_since( $last_active ) );
+        }
+    }
 function bp_group_permalink( $deprecated = false, $deprecated2 = true ) {
     if ( !$deprecated2 )
 …
             $group =& $groups_template->group;
         return apply_filters( 'bp_get_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' );
+        return apply_filters( 'bp_get_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/admin' );
+    }
 …
             $group =& $groups_template->group;
         return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) );
+        return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) );
+    }
 …
+        }
+    }
 function bp_group_is_public( $deprecated = false ) {
     echo bp_get_group_is_public();
 …
 function bp_group_is_admin() {
     global $bp;
     return $bp->is_item_admin;
+}
 …
 function bp_group_is_mod() {
     global $bp;
     return $bp->is_item_mod;
+}
 …
 function bp_group_list_admins( $full_list = true, $group = false ) {
     global $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     if ( !$admins = &$group->admins )
         $admins = $group->get_administrators();
 …
         <span class="activity"><?php _e( 'No Admins', 'buddypress' ) ?></span>
     <?php } ?>
 <?php
+}
 …
 function bp_group_list_mods( $full_list = true, $group = false ) {
     global $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     $group_mods = groups_get_group_mods( $group->id );
     if ( $group_mods ) {
         if ( $full_list ) { ?>
 …
         <span class="activity"><?php _e( 'No Mods', 'buddypress' ) ?></span>
     <?php } ?>
 <?php
+}
 …
     if ( !$group )
         $group =& $groups_template->group;
     if ( !$deprecated )
         return bp_get_group_all_members_permalink();
 …
         <label for="<?php echo $name ?>" id="<?php echo $name ?>-label"><?php echo $label ?></label>
         <input type="search" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo $value ?>"<?php echo $disabled ?> />
         <?php wp_nonce_field( 'group-filter-box', '_wpnonce_group_filter' ) ?>
     </form>
 …
 function bp_group_show_no_groups_message() {
     global $bp;
     if ( !groups_total_groups_for_user( $bp->displayed_user->id ) )
         return true;
     return false;
+}
 …
     function bp_get_group_pagination() {
         global $groups_template;
         return apply_filters( 'bp_get_group_pagination', $groups_template->pag_links );
+    }
 …
     echo sprintf( __( 'Viewing group %d to %d (of %d groups)', 'buddypress' ), $from_num, $to_num, $groups_template->total_group_count ); ?> &nbsp;
     <span class="ajax-loader"></span><?php
+    <span class="ajax-loader"></span><?php
+}
 …
     if ( !$group )
         $group =& $groups_template->group;
     if ( $group->enable_wire )
         return true;
     return false;
+}
 …
             if ( $group->enable_forum )
                 return true;
             return false;
         } else {
 …
+        }
+    }
     return false;
+    return false;
+}
 …
     if ( !$group )
         $group =& $groups_template->group;
     if ( $group->enable_forum )
         echo ' checked="checked"';
 …
     if ( !$group )
         $group =& $groups_template->group;
     if ( $setting == $group->status )
         echo ' checked="checked"';
 …
 function bp_group_admin_memberlist( $admin_list = false, $group = false ) {
     global $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     $admins = groups_get_group_admins( $group->id );
 ?>
 …
                 <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>
                 <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
                 <?php if ( function_exists( 'friends_install' ) ) : ?>
                     <div class="action">
 …
                     </div>
                 <?php endif; ?>
             </li>
+            </li>
             <?php } ?>
         <?php } ?>
 …
 function bp_group_mod_memberlist( $admin_list = false, $group = false ) {
     global $groups_template, $group_mods;
+    global $groups_template, $group_mods;
     if ( !$group )
         $group =& $groups_template->group;
     $group_mods = groups_get_group_mods( $group->id );
     ?>
 …
                     <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5>
                     <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
                     <?php if ( function_exists( 'friends_install' ) ) : ?>
                         <div class="action">
 …
                         </div>
                     <?php endif; ?>
                 </li>
                 <?php } ?>
+                </li>
+                <?php } ?>
             <?php } ?>
             </ul>
 …
         return apply_filters( 'bp_get_group_member_demote_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/demote/' . $user_id, 'groups_demote_member' ) );
+    }
 function bp_group_member_ban_link( $user_id = false, $deprecated = false ) {
     global $members_template;
 …
     if ( !$user_id )
         $user_id = $members_template->member->user_id;
     echo bp_get_group_member_unban_link( $user_id );
+    echo bp_get_group_member_unban_link( $user_id );
+}
     function bp_get_group_member_unban_link( $user_id = false, $group = false ) {
 …
         if ( !$user_id )
             $user_id = $members_template->member->user_id;
         if ( !$group )
             $group =& $groups_template->group;
         return apply_filters( 'bp_get_group_member_unban_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/unban/' . $user_id, 'groups_unban_member' ) );
+        if ( !$group )
+            $group =& $groups_template->group;
+        return apply_filters( 'bp_get_group_member_unban_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/admin/manage-members/unban/' . $user_id, 'groups_unban_member' ) );
+    }
 …
     if ( !$group )
         $group = ( $groups_template->group ) ? $groups_template->group : $bp->groups->current_group;
     $current_tab = $bp->action_variables[0];
 ?>
 …
         <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
     <?php } ?>
     <?php
         if ( !$bp->is_item_admin )
 …
         <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
     <?php endif; ?>
     <?php do_action( 'groups_admin_tabs', $current_tab, $group->slug ) ?>
     <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
 <?php
 …
         return apply_filters( 'bp_group_form_action', bp_get_group_permalink( $group ) . '/' . $page );
+    }
 function bp_group_admin_form_action( $page = false, $deprecated = false ) {
     echo bp_get_group_admin_form_action( $page );
 …
 function bp_group_has_requested_membership( $group = false ) {
     global $bp, $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     if ( groups_check_for_membership_request( $bp->loggedin_user->id, $group->id ) )
         return true;
     return false;
+}
 …
     if ( !$group )
         $group =& $groups_template->group;
     if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) )
         return true;
     return false;
+}
 …
             $group =& $groups_template->group;
         return apply_filters( 'bp_get_group_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );
+        return apply_filters( 'bp_get_group_accept_invite_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/invites/accept/' . $group->id, 'groups_accept_invite' ) );
+    }
 …
             $group =& $groups_template->group;
         return apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group/yes', 'groups_leave_group' ) );
+        return apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group/yes', 'groups_leave_group' ) );
+    }
 …
 function bp_has_friends_to_invite( $group = false ) {
     global $groups_template, $bp;
     if ( !function_exists('friends_install') )
         return false;
 …
     if ( !$group )
         $group =& $groups_template->group;
     if ( !friends_check_user_has_friends( $bp->loggedin_user->id ) || !friends_count_invitable_friends( $bp->loggedin_user->id, $group->id ) )
         return false;
     return true;
+}
 …
 function bp_group_join_button( $group = false ) {
     global $bp, $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     // If they're not logged in or are banned from the group, no join button.
     if ( !is_user_logged_in() || groups_is_user_banned( $bp->loggedin_user->id, $group->id ) )
 …
     if ( !$group->status )
         return false;
     echo '<div class="generic-button group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
     switch ( $group->status ) {
         case 'public':
             if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) )
                 echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
             else
                 echo '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
+                echo '<a class="join-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
         break;
         case 'private':
             if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) ) {
                 echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
             } else {
                 if ( !bp_group_has_requested_membership( $group ) )
                     echo '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
+                    echo '<a class="request-membership" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_request_membership' ) . '">' . __('Request Membership', 'buddypress') . '</a>';
                 else
                     echo '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
+                    echo '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
+            }
         break;
+    }
     echo '</div>';
+}
 …
 function bp_group_status_message( $group = false ) {
     global $groups_template;
     if ( !$group )
         $group =& $groups_template->group;
     if ( 'private' == $group->status ) {
         if ( !bp_group_has_requested_membership() )
 …
             else
                 _e( 'This is a private group. To join you must be a registered site member and request group membership.', 'buddypress' );
         else
             _e( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );
+        else
+            _e( 'This is a private group. Your membership request is awaiting approval from the group administrator.', 'buddypress' );
     } else {
         _e( 'This is a hidden group and only invited members can join.', 'buddypress' );
 …
     var $members;
     var $member;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_group_count;
     function bp_groups_group_members_template( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned ) {
         global $bp;
         $this->pag_page = isset( $_REQUEST['mlpage'] ) ? intval( $_REQUEST['mlpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
         $this->members = BP_Groups_Member::get_all_for_group( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned );
         if ( !$max || $max >= (int)$this->members['count'] )
             $this->total_member_count = (int)$this->members['count'];
 …
         $this->members = $this->members['members'];
         if ( $max ) {
             if ( $max >= count($this->members) )
 …
         ));
+    }
     function has_members() {
         if ( $this->member_count )
 …
         return false;
+    }
     function next_member() {
         $this->current_member++;
         $this->member = $this->members[$this->current_member];
         return $this->member;
+    }
     function rewind_members() {
         $this->current_member = -1;
 …
+        }
+    }
     function members() {
+    function members() {
         if ( $this->current_member + 1 < $this->member_count ) {
             return true;
 …
         return false;
+    }
     function the_member() {
         global $member;
 …
 function bp_group_has_members( $args = '' ) {
     global $bp, $members_template;
     $defaults = array(
         'group_id' => $bp->groups->current_group->id,
 …
 function bp_group_members() {
     global $members_template;
     return $members_template->members();
+}
 …
 function bp_group_the_member() {
     global $members_template;
     return $members_template->the_member();
+}
 …
         return apply_filters( 'bp_get_group_member_link', bp_core_get_userlink( $members_template->member->user_id ) );
+    }
 function bp_group_member_is_banned() {
     echo bp_get_group_member_is_banned();
 …
         return apply_filters( 'bp_get_group_member_joined_since', bp_core_get_last_activity( strtotime( $members_template->member->date_modified ), __( 'joined %s ago', 'buddypress') ) );
+    }
 function bp_group_member_id() {
     echo bp_get_group_member_id();
 …
     if ( $members_template->total_member_count > $members_template->pag_num )
         return true;
     return false;
+}
 …
         $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
         $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 );
         return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count ) );
+        $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 );
+        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count ) );
+    }
 …
     function bp_get_group_member_admin_pagination() {
         global $members_template;
         return $members_template->pag_links;
+    }
 …
 function bp_group_creation_tabs() {
     global $bp;
     if ( !is_array( $bp->groups->group_creation_steps ) )
         return false;
     if ( !$bp->groups->current_create_step )
         $bp->groups->current_create_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
 …
     foreach ( $bp->groups->group_creation_steps as $slug => $step ) {
         $is_enabled = bp_are_previous_group_creation_steps_complete( $slug ); ?>
         <li<?php if ( $bp->groups->current_create_step == $slug ) : ?> class="current"<?php endif; ?>><?php if ( $is_enabled ) : ?><a href="<?php echo $bp->loggedin_user->domain . $bp->groups->slug ?>/create/step/<?php echo $slug ?>"><?php endif; ?><?php echo $counter ?>. <?php echo $step['name'] ?><?php if ( $is_enabled ) : ?></a><?php endif; ?></li><?php
         $counter++;
+    }
     unset( $is_enabled );
     do_action( 'groups_creation_tabs' );
+}
 …
 function bp_group_creation_stage_title() {
     global $bp;
     echo apply_filters( 'bp_group_creation_stage_title', '<span>&mdash; ' . $bp->groups->group_creation_steps[$bp->groups->current_create_step]['name'] . '</span>' );
+}
 …
     function bp_get_group_creation_form_action() {
         global $bp;
         if ( empty( $bp->action_variables[1] ) )
             $bp->action_variables[1] = array_shift( array_keys( $bp->groups->group_creation_steps ) );
         return apply_filters( 'bp_get_group_creation_form_action', $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->action_variables[1] );
+    }
 …
 function bp_is_group_creation_step( $step_slug ) {
     global $bp;
     /* Make sure we are in the groups component */
     if ( $bp->current_component != BP_GROUPS_SLUG || 'create' != $bp->current_action )
         return false;
     /* If this the first step, we can just accept and return true */
     if ( !$bp->action_variables[1] && array_shift( array_keys( $bp->groups->group_creation_steps ) ) == $step_slug )
         return true;
     /* Before allowing a user to see a group creation step we must make sure previous steps are completed */
     if ( !bp_is_first_group_creation_step() ) {
 …
             return false;
+    }
     /* Check the current step against the step parameter */
     if ( $bp->action_variables[1] == $step_slug )
         return true;
     return false;
+}
 …
 function bp_is_group_creation_step_complete( $step_slugs ) {
     global $bp;
     if ( !$bp->groups->completed_create_steps )
         return false;
 …
     if ( is_array( $step_slugs ) ) {
         $found = true;
         foreach ( $step_slugs as $step_slug ) {
             if ( !in_array( $step_slug, $bp->groups->completed_create_steps ) )
                 $found = false;
+        }
         return $found;
     } else {
         return in_array( $step_slugs, $bp->groups->completed_create_steps );
+        return in_array( $step_slugs, $bp->groups->completed_create_steps );
+    }
 …
 function bp_are_previous_group_creation_steps_complete( $step_slug ) {
     global $bp;
     /* If this is the first group creation step, return true */
     if ( array_shift( array_keys( $bp->groups->group_creation_steps ) ) == $step_slug )
         return true;
     reset( $bp->groups->group_creation_steps );
     unset( $previous_steps );
     /* Get previous steps */
     foreach ( $bp->groups->group_creation_steps as $slug => $name ) {
         if ( $slug == $step_slug )
             break;
         $previous_steps[] = $slug;
+    }
     return bp_is_group_creation_step_complete( $previous_steps );
+}
 …
         return apply_filters( 'bp_get_new_group_id', $bp->groups->new_group_id );
+    }
 function bp_new_group_name() {
     echo bp_get_new_group_name();
 …
     function bp_get_new_group_avatar( $args = '' ) {
         global $bp;
         $defaults = array(
             'type' => 'full',
 …
             'class' => 'avatar',
             'id' => 'avatar-crop-preview',
             'alt' => __( 'Group avatar', 'buddypress' )
+            'alt' => __( 'Group avatar', 'buddypress' )
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         return apply_filters( 'bp_get_new_group_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'width' => $width, 'height' => $height, 'class' => $class ) ) );
+    }
 …
     function bp_get_group_creation_previous_link() {
         global $bp;
         foreach ( $bp->groups->group_creation_steps as $slug => $name ) {
             if ( $slug == $bp->action_variables[1] )
                 break;
             $previous_steps[] = $slug;
+        }
 …
 function bp_is_last_group_creation_step() {
     global $bp;
     $last_step = array_pop( array_keys( $bp->groups->group_creation_steps ) );
     if ( $last_step == $bp->groups->current_create_step )
         return true;
     return false;
+}
 …
 function bp_is_first_group_creation_step() {
     global $bp;
     $first_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
     if ( $first_step == $bp->groups->current_create_step )
         return true;
     return false;
+}
 …
         if ( !function_exists('friends_install') )
             return false;
         $defaults = array(
             'group_id' => false,
 …
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         if ( !$group_id )
             $group_id = ( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : $bp->groups->current_group->id;
         $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $group_id );
         if ( $friends ) {
             $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_id );
 …
                     } else {
                         $checked = '';
+                    }
+                    }
+                }
                 $items[] = '<' . $separator . '><input' . $checked . ' type="checkbox" name="friends[]" id="f-' . $friends[$i]['id'] . '" value="' . attribute_escape( $friends[$i]['id'] ) . '" /> ' . $friends[$i]['full_name'] . '</' . $separator . '>';
+            }
+        }
         return implode( "\n", (array)$items );
+    }
 …
     var $groups;
     var $group;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_group_count;
     function bp_groups_site_groups_template( $type, $per_page, $max ) {
         global $bp;
         /* TODO: Move $_REQUEST vars out of here */
         $this->pag_page = isset( $_REQUEST['gpage'] ) ? intval( $_REQUEST['gpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 …
         } else if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
             $this->groups = BP_Groups_Group::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
         } else {
             switch ( $type ) {
                 case 'active': default:
                     $this->groups = groups_get_active( $this->pag_num, $this->pag_page );
                     break;
+                    break;
                 case 'alphabetical': default:
                     $this->groups = groups_get_alphabetically( $this->pag_num, $this->pag_page );
                     break;
                 case 'random':
+                    break;
+                case 'random':
                     $this->groups = groups_get_random_groups( $this->pag_num, $this->pag_page );
                     break;
                 case 'newest':
                     $this->groups = groups_get_newest( $this->pag_num, $this->pag_page );
 …
                 case 'popular':
                     $this->groups = groups_get_popular( $this->pag_num, $this->pag_page );
                     break;
+                    break;
                 case 'most-forum-topics':
                     $this->groups = groups_get_by_most_forum_topics( $this->pag_num, $this->pag_page );
                     break;
                 case 'most-forum-posts':
                     $this->groups = groups_get_by_most_forum_posts( $this->pag_num, $this->pag_page );
 …
+            }
+        }
         if ( !$max || $max >= (int)$this->groups['total'] )
             $this->total_group_count = (int)$this->groups['total'];
 …
         $this->groups = $this->groups['groups'];
         if ( $max ) {
             if ( $max >= count($this->groups) )
 …
             $this->group_count = count($this->groups);
+        }
         if ( (int) $this->total_group_count && (int) $this->pag_num ) {
             $this->pag_links = paginate_links( array(
 …
                 'next_text' => '&raquo;',
                 'mid_size' => 1
             ));
+    }
+    }
+            ));
+    }
+    }
     function has_groups() {
         if ( $this->group_count )
             return true;
         return false;
+    }
     function next_group() {
         $this->current_group++;
         $this->group = $this->groups[$this->current_group];
         return $this->group;
+    }
     function rewind_groups() {
         $this->current_group = -1;
 …
+        }
+    }
     function groups() {
+    function groups() {
         if ( $this->current_group + 1 < $this->group_count ) {
             return true;
 …
         return false;
+    }
     function the_group() {
         global $group;
 …
         $this->in_the_loop = true;
         $this->group = $this->next_group();
         if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $this->group->group_id, 'bp' ) ) {
             $group = new BP_Groups_Group( $this->group->group_id, false, false );
             wp_cache_set( 'groups_group_nouserdata_' . $this->group->group_id, $group, 'bp' );
+        }
         $this->group = $group;
         if ( 0 == $this->current_group ) // loop has just started
             do_action('loop_start');
 …
 function bp_rewind_site_groups() {
     global $site_groups_template;
     $site_groups_template->rewind_groups();
+    $site_groups_template->rewind_groups();
+}
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     // type: active ( default ) | random | newest | popular
     if ( $max ) {
         if ( $per_page > $max )
             $per_page = $max;
+    }
     $site_groups_template = new BP_Groups_Site_Groups_Template( $type, $per_page, $max );
     return apply_filters( 'bp_has_site_groups', $site_groups_template->has_groups(), &$site_groups_template );
 …
 function bp_site_groups() {
     global $site_groups_template;
     return $site_groups_template->groups();
+}
 …
 function bp_the_site_group() {
     global $site_groups_template;
     return $site_groups_template->the_group();
+}
 …
 function bp_site_groups_pagination_count() {
     global $bp, $site_groups_template;
     $from_num = intval( ( $site_groups_template->pag_page - 1 ) * $site_groups_template->pag_num ) + 1;
     $to_num = ( $from_num + ( $site_groups_template->pag_num - 1 ) > $site_groups_template->total_group_count ) ? $site_groups_template->total_group_count : $from_num + ( $site_groups_template->pag_num - 1) ;
     echo sprintf( __( 'Viewing group %d to %d (of %d groups)', 'buddypress' ), $from_num, $to_num, $site_groups_template->total_group_count ); ?> &nbsp;
     <span class="ajax-loader"></span><?php
+    <span class="ajax-loader"></span><?php
+}
 …
     function bp_get_site_groups_pagination_links() {
         global $site_groups_template;
         return apply_filters( 'bp_get_site_groups_pagination_links', $site_groups_template->pag_links );
+    }
 …
     function bp_get_the_site_group_id() {
         global $site_groups_template;
         return apply_filters( 'bp_get_the_site_group_id', $site_groups_template->group->id );
+    }
 …
     function bp_get_the_site_group_avatar_thumb() {
         global $site_groups_template;
         return apply_filters( 'bp_get_the_site_group_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $site_groups_template->group->id, 'object' => 'group', 'type' => 'thumb', 'avatar_dir' => 'group-avatars', 'alt' => __( 'Group Avatar', 'buddypress' ) ) ) );
+    }
 …
     function bp_get_the_site_group_link() {
         global $site_groups_template;
         return apply_filters( 'bp_get_the_site_group_link', bp_get_group_permalink( $site_groups_template->group ) );
+    }
 …
         return apply_filters( 'bp_get_the_site_group_name', bp_get_group_name( $site_groups_template->group ) );
+    }
 function bp_the_site_group_last_active() {
 …
 function bp_the_site_group_join_button() {
     global $site_groups_template;
     echo bp_group_join_button( $site_groups_template->group );
+}
 …
         global $site_groups_template;
         return apply_filters( 'bp_get_the_site_group_description', bp_get_group_description( $site_groups_template->group ) );
+        return apply_filters( 'bp_get_the_site_group_description', bp_get_group_description( $site_groups_template->group ) );
+    }
 …
         global $site_groups_template;
         return apply_filters( 'bp_get_the_site_group_description_excerpt', bp_create_excerpt( bp_get_group_description( $site_groups_template->group, false ), 25 ) );
+        return apply_filters( 'bp_get_the_site_group_description_excerpt', bp_create_excerpt( bp_get_group_description( $site_groups_template->group, false ), 25 ) );
+    }
 function bp_the_site_group_date_created() {
     echo bp_get_the_site_group_date_created();
+    echo bp_get_the_site_group_date_created();
+}
     function bp_get_the_site_group_date_created() {
         global $site_groups_template;
         return apply_filters( 'bp_get_the_site_group_date_created', bp_core_time_since( $site_groups_template->group->date_created ) );
+        return apply_filters( 'bp_get_the_site_group_date_created', bp_core_time_since( $site_groups_template->group->date_created ) );
+    }
 …
             return apply_filters( 'bp_get_the_site_group_member_count', sprintf( __( '%d member', 'buddypress' ), (int) $site_groups_template->group->total_member_count ) );
         else
             return apply_filters( 'bp_get_the_site_group_member_count', sprintf( __( '%d members', 'buddypress' ), (int) $site_groups_template->group->total_member_count ) );
+            return apply_filters( 'bp_get_the_site_group_member_count', sprintf( __( '%d members', 'buddypress' ), (int) $site_groups_template->group->total_member_count ) );
+    }
 …
         if ( !function_exists( 'bp_forums_get_forum_topicpost_count' ) )
             return false;
         if ( !$site_groups_template->group->forum_counts )
             $site_groups_template->group->forum_counts = bp_forums_get_forum_topicpost_count( (int)$forum_id );
 …
                 $total_topics = sprintf( __( '%d topic', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->topics );
             else
                 $total_topics = sprintf( __( '%d topics', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->topics );
+                $total_topics = sprintf( __( '%d topics', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->topics );
         } else {
             $total_topics = (int) $site_groups_template->group->forum_counts[0]->topics;
+        }
         return apply_filters( 'bp_get_the_site_group_forum_topic_count', $total_topics, (bool)$showtext );
+    }
 …
     function bp_get_the_site_group_forum_post_count( $args = '' ) {
         global $site_groups_template;
         $defaults = array(
             'showtext' => false
 …
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         if ( !$forum_id = groups_get_groupmeta( $site_groups_template->group->id, 'forum_id' ) )
             return false;
 …
         if ( !function_exists( 'bp_forums_get_forum_topicpost_count' ) )
             return false;
         if ( !$site_groups_template->group->forum_counts )
             $site_groups_template->group->forum_counts = bp_forums_get_forum_topicpost_count( (int)$forum_id );
 …
                 $total_posts = sprintf( __( '%d post', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->posts );
             else
                 $total_posts = sprintf( __( '%d posts', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->posts );
+                $total_posts = sprintf( __( '%d posts', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->posts );
         } else {
             $total_posts = (int) $site_groups_template->group->forum_counts[0]->posts;
+        }
         return apply_filters( 'bp_get_the_site_group_forum_post_count', $total_posts, (bool)$showtext );
+    }
 …
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
     if ( isset( $_REQUEST['letter'] ) ) {
         echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
     if ( isset( $_REQUEST['groups_search'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['groups_search'] ) . '" name="search_terms" />';
 …
     var $requests;
     var $request;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_request_count;
     function bp_groups_membership_requests_template( $group_id, $per_page, $max ) {
         global $bp;
         $this->pag_page = isset( $_REQUEST['mrpage'] ) ? intval( $_REQUEST['mrpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
         $this->requests = BP_Groups_Group::get_membership_requests( $group_id, $this->pag_num, $this->pag_page );
+        $this->requests = BP_Groups_Group::get_membership_requests( $group_id, $this->pag_num, $this->pag_page );
         if ( !$max || $max >= (int)$this->requests['total'] )
 …
         $this->requests = $this->requests['requests'];
         if ( $max ) {
             if ( $max >= count($this->requests) )
 …
         ));
+    }
     function has_requests() {
         if ( $this->request_count )
             return true;
         return false;
+    }
     function next_request() {
         $this->current_request++;
         $this->request = $this->requests[$this->current_request];
         return $this->request;
+    }
     function rewind_requests() {
         $this->current_request = -1;
 …
+        }
+    }
     function requests() {
+    function requests() {
         if ( $this->current_request + 1 < $this->request_count ) {
             return true;
 …
         return false;
+    }
     function the_request() {
         global $request;
 …
 function bp_group_membership_requests() {
     global $requests_template;
     return $requests_template->requests();
+}
 …
 function bp_group_the_membership_request() {
     global $requests_template;
     return $requests_template->the_request();
+}
 …
 function bp_group_request_user_avatar_thumb() {
     global $requests_template;
     echo apply_filters( 'bp_group_request_user_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $requests_template->request->user_id, 'type' => 'thumb' ) ) );
+}
 function bp_group_request_reject_link() {
     global $requests_template, $groups_template;
+    global $requests_template, $groups_template;
     echo apply_filters( 'bp_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . '/admin/membership-requests/reject/' . $requests_template->request->id, 'groups_reject_membership_request' ) );
 …
 function bp_group_request_accept_link() {
     global $requests_template, $groups_template;
+    global $requests_template, $groups_template;
     echo apply_filters( 'bp_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( $groups_template->group ) . '/admin/membership-requests/accept/' . $requests_template->request->id, 'groups_accept_membership_request' ) );
 …
 function bp_group_request_time_since_requested() {
     global $requests_template;
+    global $requests_template;
     echo apply_filters( 'bp_group_request_time_since_requested', sprintf( __( 'requested %s ago', 'buddypress' ), bp_core_time_since( strtotime( $requests_template->request->date_modified ) ) ) );
 …
 function bp_group_request_comment() {
     global $requests_template;
     echo apply_filters( 'bp_group_request_comment', strip_tags( stripslashes( $requests_template->request->comments ) ) );
+}
 …
 function bp_group_request_user_link() {
     global $requests_template;
     echo apply_filters( 'bp_group_request_user_link', bp_core_get_userlink( $requests_template->request->user_id ) );
+}
 …
     var $invites;
     var $invite;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_invite_count;
     function bp_groups_invite_template( $user_id, $group_id ) {
         global $bp;
         $this->invites = groups_get_invites_for_group( $user_id, $group_id );
         $this->invite_count = count( $this->invites );
+    }
+        $this->invite_count = count( $this->invites );
+    }
     function has_invites() {
         if ( $this->invite_count )
             return true;
         return false;
+    }
     function next_invite() {
         $this->current_invite++;
         $this->invite = $this->invites[$this->current_invite];
         return $this->invite;
+    }
     function rewind_invites() {
         $this->current_invite = -1;
 …
+        }
+    }
     function invites() {
+    function invites() {
         if ( $this->current_invite + 1 < $this->invite_count ) {
             return true;
 …
         return false;
+    }
     function the_invite() {
         global $invite;
 …
         $this->in_the_loop = true;
         $user_id = $this->next_invite();
         $this->invite = new stdClass;
         $this->invite->user = new BP_Core_User( $user_id );
         $this->invite->group_id = $group_id; // Globaled in bp_group_has_invites()
         if ( 0 == $this->current_invite ) // loop has just started
             do_action('loop_start');
 …
 function bp_group_has_invites( $args = '' ) {
     global $bp, $invites_template, $group_id;
     $defaults = array(
         'group_id' => false,
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     if ( !$group_id ) {
         /* Backwards compatibility */
 …
         if ( $bp->groups->new_group_id ) $group_id = $bp->groups->new_group_id;
+    }
     if ( !$group_id )
         return false;
 …
 function bp_group_invites() {
     global $invites_template;
     return $invites_template->invites();
+}
 …
 function bp_group_the_invite() {
     global $invites_template;
     return $invites_template->the_invite();
+}
 …
     function bp_get_group_invite_user_remove_invite_url() {
         global $invites_template;
         return wp_nonce_url( site_url( BP_GROUPS_SLUG . '/' . $invites_template->invite->group_id . '/invites/remove/' . $invites_template->invite->user->id ), 'groups_invite_uninvite_user' );
+    }

trunk/bp-groups/bp-groups-widgets.php

-                      r1926
+                      r2077
 /* Register widgets for groups component */
 function groups_register_widgets() {
     add_action('widgets_init', create_function('', 'return register_widget("BP_Groups_Widget");') );
+    add_action('widgets_init', create_function('', 'return register_widget("BP_Groups_Widget");') );
+}
 add_action( 'plugins_loaded', 'groups_register_widgets' );
 …
     function bp_groups_widget() {
         parent::WP_Widget( false, $name = __( 'Groups', 'buddypress' ) );
         if ( is_active_widget( false, false, $this->id_base ) )
             wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery', 'jquery-livequery-pack') );
+            wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery', 'jquery-livequery-pack') );
+    }
     function widget($args, $instance) {
         global $bp;
         extract( $args );
         echo $before_widget;
         echo $before_title
            . $widget_name
+           . $widget_name
            . $after_title; ?>
         <?php if ( bp_has_site_groups( 'type=popular&per_page=' . $instance['max_groups'] . '&max=' . $instance['max_groups'] ) ) : ?>
             <div class="item-options" id="groups-list-options">
                 <span class="ajax-loader" id="ajax-loader-groups"></span>
                 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="newest-groups"><?php _e("Newest", 'buddypress') ?></a> |
                 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="recently-active-groups"><?php _e("Active", 'buddypress') ?></a> |
+                <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="newest-groups"><?php _e("Newest", 'buddypress') ?></a> |
+                <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="recently-active-groups"><?php _e("Active", 'buddypress') ?></a> |
                 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="popular-groups" class="selected"><?php _e("Popular", 'buddypress') ?></a>
             </div>
             <ul id="groups-list" class="item-list">
                 <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
 …
                 <?php endwhile; ?>
             </ul>
+            </ul>
             <?php wp_nonce_field( 'groups_widget_groups_list', '_wpnonce-groups' ); ?>
             <input type="hidden" name="groups_widget_max" id="groups_widget_max" value="<?php echo attribute_escape( $instance['max_groups'] ); ?>" />
         <?php else: ?>
 …
         <?php endif; ?>
         <?php echo $after_widget; ?>
     <?php
 …
 function groups_ajax_widget_groups_list() {
     global $bp;
     check_ajax_referer('groups_widget_groups_list');
 …
     if ( bp_has_site_groups( 'type=' . $type . '&per_page=' . $_POST['max_groups'] . '&max=' . $_POST['max_groups'] ) ) : ?>
         <?php echo "0[[SPLIT]]"; ?>
         <ul id="groups-list" class="item-list">
             <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
 …
                         <div class="item-meta">
                             <span class="activity">
                                 <?php
+                                <?php
                                 if ( 'newest-groups' == $_POST['filter'] ) {
                                     bp_the_site_group_date_created();
 …
             <?php endwhile; ?>
         </ul>
+        </ul>
         <?php wp_nonce_field( 'groups_widget_groups_list', '_wpnonce-groups' ); ?>
         <input type="hidden" name="groups_widget_max" id="groups_widget_max" value="<?php echo attribute_escape( $_POST['max_groups'] ); ?>" />
     <?php else: ?>
 …
     <?php endif;
+}
 add_action( 'wp_ajax_widget_groups_list', 'groups_ajax_widget_groups_list' );

trunk/bp-groups/deprecated/bp-groups-deprecated.php

-                      r1906
+                      r2077
+ *
  * This file contains functions that are deprecated.
  * You should not under any circumstance use these functions as they are
+ * You should not under any circumstance use these functions as they are
  * either no longer valid, or have been replaced with something much more awesome.
+ *
 …
  * Of course, things will still work if you use these functions but you will
  * be the laughing stock of the BuddyPress community. We will all point and laugh at
  * you. You'll also be making things harder for yourself in the long run,
+ * you. You'll also be making things harder for yourself in the long run,
  * and you will miss out on lovely performance and functionality improvements.
+ *
+ *
  * If you've checked you are not using any deprecated functions and finished your little
  * dance, you can add the following line to your wp-config.php file to prevent any of
 …
 function groups_deprecated_globals() {
     global $bp;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
 …
     $bp->groups->image_base = BP_PLUGIN_URL . '/bp-groups/deprecated/images';
+}
 add_action( 'plugins_loaded', 'groups_deprecated_globals', 5 );
+add_action( 'plugins_loaded', 'groups_deprecated_globals', 5 );
 add_action( 'admin_menu', 'groups_deprecated_globals', 2 );
 …
         <p>
             <input type="file" name="file" id="file" />
+            <input type="file" name="file" id="file" />
             <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />
             <input type="hidden" name="action" id="action" value="bp_avatar_upload" />
 …
         <h3><?php _e( 'Crop Group Avatar', 'buddypress' ) ?></h3>
         <img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ) ?>" />
         <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />
         <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />
         <input type="hidden" name="upload" id="upload" />
 …
 function groups_get_avatar_hrefs( $avatars ) {
     global $bp;
     $src = $bp->root_domain . '/';
     $thumb_href = str_replace( ABSPATH, $src, stripslashes( $avatars['v1_out'] ) );
     $full_href = str_replace( ABSPATH, $src, stripslashes ( $avatars['v2_out'] ) );
     return array( 'thumb_href' => $thumb_href, 'full_href' => $full_href );
+}
 …
 function groups_force_buddypress_theme( $template ) {
     global $bp;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $stylesheet;
     if ( $bp->current_component != $bp->groups->slug )
         return $stylesheet;
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     if ( $bp->current_component == $bp->groups->slug )
         wp_enqueue_script( 'bp-groups-js', BP_PLUGIN_URL . '/bp-groups/deprecated/js/general.js' );
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     /* Enqueue the structure CSS file to give basic positional formatting for components */
     wp_enqueue_style( 'bp-groups-structure', BP_PLUGIN_URL . '/bp-groups/deprecated/css/structure.css' );
+    wp_enqueue_style( 'bp-groups-structure', BP_PLUGIN_URL . '/bp-groups/deprecated/css/structure.css' );
+}
 add_action( 'bp_styles', 'groups_add_structure_css' );
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     wp_enqueue_script( 'bp-groups-directory-groups', BP_PLUGIN_URL . '/bp-groups/deprecated/js/directory-groups.js', array( 'jquery', 'jquery-livequery-pack' ) );
+}
 …
 function bp_groups_random_selection( $total_groups = 5 ) {
     global $bp;
     if ( !$group_ids = wp_cache_get( 'groups_random_groups', 'bp' ) ) {
         $group_ids = BP_Groups_Group::get_random( $total_groups, 1 );
         wp_cache_set( 'groups_random_groups', $group_ids, 'bp' );
+    }
 ?>
+?>
     <?php if ( $group_ids['groups'] ) { ?>
         <ul class="item-list" id="random-groups-list">
         <?php
             for ( $i = 0; $i < count( $group_ids['groups'] ); $i++ ) {
+        <?php
+            for ( $i = 0; $i < count( $group_ids['groups'] ); $i++ ) {
                 if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $group_ids['groups'][$i]->group_id, 'bp' ) ) {
                     $group = new BP_Groups_Group( $group_ids['groups'][$i]->group_id, false, false );
                     wp_cache_set( 'groups_group_nouserdata_' . $group_ids['groups'][$i]->group_id, $group, 'bp' );
+                }
             ?>
+            ?>
             <li>
                 <div class="item-avatar">
 …
                     <div class="item-meta desc"><?php echo bp_create_excerpt( $group->description ) ?></div>
                 </div>
                 <div class="action">
                     <?php bp_group_join_button( $group ) ?>
                     <div class="meta">
                         <?php $member_count = groups_get_groupmeta( $group->id, 'total_member_count' ) ?>
                         <?php echo ucwords($group->status) ?> <?php _e( 'Group', 'buddypress' ) ?> /
+                        <?php echo ucwords($group->status) ?> <?php _e( 'Group', 'buddypress' ) ?> /
                         <?php if ( 1 == $member_count ) : ?>
                             <?php printf( __( '%d member', 'buddypress' ), $member_count ) ?>
 …
                     </div>
                 </div>
                 <div class="clear"></div>
             </li>
 …
         <div id="message" class="info">
             <p><?php _e( "There aren't enough groups to show a random sample just yet.", 'buddypress' ) ?></p>
         </div>
+        </div>
     <?php } ?>
 <?php
 …
 function bp_groups_random_groups( $total_groups = 5 ) {
     global $bp;
     if ( !$group_ids = wp_cache_get( 'groups_random_user_groups_' . $bp->displayed_user->id . '_' . $total_groups, 'bp' ) ) {
         $group_ids = groups_get_random_groups_for_user( $bp->displayed_user->id, $total_groups, 1 );
         wp_cache_set( 'groups_random_user_groups_' . $bp->displayed_user->id . '_' . $total_groups, $group_ids, 'bp' );
+    }
 ?>
+?>
     <div class="info-group">
         <h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php echo BP_Groups_Member::total_group_count() ?>) <span><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></span></h4>
         <?php if ( $group_ids ) { ?>
             <ul class="horiz-gallery">
             <?php
+            <?php
             for ( $i = 0; $i < count( $group_ids ); $i++ ) {
                 if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $group_ids[$i], 'bp' ) ) {
 …
     if ( !$group )
         $group =& $groups_template->group;
     $forum_id = groups_get_groupmeta( $group->id, 'forum_id' );
 …
         if ( function_exists( 'bp_forums_setup' ) ) {
             $latest_topics = bp_forums_get_forum_topics( array( 'forum_id' => $forum_id ) );
             if ( $latest_topics ) { ?>
                 <ul class="item-list" id="recent-forum-topics"><?php
                 $counter = 0;
                 foreach( $latest_topics as $topic ) {
                     $alt = ( $counter % 2 == 1 ) ? ' class="alt"' : '';
                     $forum_template->topic = (object)$topic; ?>
                     <li<?php echo $alt ?>>
                         <div class="avatar">
 …
                         </div>
                         <a href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a>
+                        <a href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a>
                         <span class="small">- <?php bp_the_topic_total_post_count() ?> </span>
                         <p><span class="activity"><?php echo sprintf( __( 'updated %s ago', 'buddypress' ), bp_the_topic_time_since_last_post( false ) ) ?></span></p>
                         <div class="latest-post">
                             <?php _e( 'Latest by', 'buddypress' ) ?> <?php bp_the_topic_last_poster_name() ?>:
 …
                     </li>
                     <?php $counter++ ?>
                 <?php } ?>
                 </ul>
 …
 function bp_group_send_invite_form( $group = false ) {
     global $bp, $groups_template, $invites;
     if ( !$group )
         $group =& $groups_template->group;
 …
     <div class="main-column">
         <div id="message" class="info">
             <p><?php _e('Select people to invite from your friends list.', 'buddypress'); ?></p>
 …
         <?php $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group->id ) ?>
         <ul id="friend-list" class="item-list">
             <?php for ( $i = 0; $i < count($invites); $i++ ) {
 …
                     <span class="activity"><?php echo $user->last_active ?></span>
                     <div class="action">
                         <a class="remove" href="<?php echo wp_nonce_url( site_url( $bp->groups->slug . '/' . $group->id . '/invites/remove/' . $user->id ), 'groups_invite_uninvite_user' ) ?>" id="uid-<?php echo $user->id ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a>
+                        <a class="remove" href="<?php echo wp_nonce_url( site_url( $bp->groups->slug . '/' . $group->id . '/invites/remove/' . $user->id ), 'groups_invite_uninvite_user' ) ?>" id="uid-<?php echo $user->id ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a>
                     </div>
                 </li>
             <?php } // end for ?>
         </ul>
         <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites' ) ?>
     </div>
 …
 function bp_group_list_invite_friends( $args = '' ) {
     global $bp, $invites;
     if ( !function_exists('friends_install') )
         return false;
 …
             <div id="invite-list">
                 <ul>
                     <?php
+                    <?php
                         for ( $i = 0; $i < count( $friends ); $i++ ) {
                             if ( $invites ) {
 …
                                 } else {
                                     $checked = '';
+                                }
+                                }
+                            }
                     ?>
                     <li><input<?php echo $checked ?> type="checkbox" name="friends[]" id="f-<?php echo $friends[$i]['id'] ?>" value="<?php echo attribute_escape( $friends[$i]['id'] ); ?>" /> <?php echo $friends[$i]['full_name']; ?></li>
                     <?php } ?>
 …
     $members = &$group->random_members;
 ?>
+?>
     <ul class="horiz-gallery">
     <?php for ( $i = 0; $i < count( $members ); $i++ ) { ?>
 …
     if ( !$user_id )
         $user_id = $members_template->member->user_id;
     echo bp_get_group_member_promote_link( $user_id );
+}
 …
         if ( !$user_id )
             $user_id = $members_template->member->user_id;
         if ( !$group )
             $group =& $groups_template->group;
 …
             <label for="group-name">* <?php _e('Group Name', 'buddypress') ?></label>
             <input type="text" name="group-name" id="group-name" value="<?php echo attribute_escape( ( $bp->groups->new_group ) ? $bp->groups->current_group->name : $_POST['group-name'] ); ?>" />
             <label for="group-desc">* <?php _e('Group Description', 'buddypress') ?></label>
             <textarea name="group-desc" id="group-desc"><?php echo htmlspecialchars( ( $bp->groups->new_group ) ? $bp->groups->current_group->description : $_POST['group-desc'] ); ?></textarea>
             <label for="group-news"><?php _e('Recent News', 'buddypress') ?></label>
             <textarea name="group-news" id="group-news"><?php echo htmlspecialchars( ( $bp->groups->new_group ) ? $bp->groups->current_group->news : $_POST['group-news'] ); ?></textarea>
             <?php do_action( 'groups_custom_group_fields_editable' ) ?>
 …
         <?php break; ?>
         <?php case 'group-settings': ?>
             <?php if ( bp_are_previous_group_creation_steps_complete( 'group-settings' ) ) { ?>
 …
                 </div>
                 <?php endif; ?>
                 <?php if ( function_exists('bp_forums_setup') ) : ?>
                     <?php if ( bp_forums_is_installed_correctly() ) { ?>
 …
                     }?>
                 <?php endif; ?>
                 <?php if ( function_exists('bp_albums_install') ) : ?>
                 <div class="checkbox with-suboptions">
 …
                 </div>
                 <?php endif; ?>
                 <h3><?php _e( 'Privacy Options', 'buddypress' ); ?></h3>
                 <div class="radio">
                     <label><input type="radio" name="group-status" value="public"<?php if ( 'public' == $bp->groups->current_group->status ) { ?> checked="checked"<?php } ?> />
+                    <label><input type="radio" name="group-status" value="public"<?php if ( 'public' == $bp->groups->current_group->status ) { ?> checked="checked"<?php } ?> />
                         <strong><?php _e( 'This is a public group', 'buddypress' ) ?></strong>
                         <ul>
 …
                         </ul>
                     </label>
                     <label><input type="radio" name="group-status" value="private"<?php if ( 'private' == $bp->groups->current_group->status ) { ?> checked="checked"<?php } ?> />
                         <strong><?php _e( 'This is a private group', 'buddypress' ) ?></strong>
 …
                         </ul>
                     </label>
                     <label><input type="radio" name="group-status" value="hidden"<?php if ( 'hidden' == $bp->groups->current_group->status ) { ?> checked="checked"<?php } ?> />
                         <strong><?php _e('This is a hidden group', 'buddypress') ?></strong>
 …
             <?php } ?>
         <?php break; ?>
         <?php case 'group-avatar': ?>
             <?php if ( bp_are_previous_group_creation_steps_complete( 'group-avatar' ) ) { ?>
 …
                     <?php bp_new_group_avatar() ?>
                 </div>
                 <div class="main-column">
                     <p><?php _e("Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress') ?></p>
                     <?php groups_avatar_upload() ?>
                 </div>
                 <?php wp_nonce_field( 'groups_step3_save' ) ?>
             <?php } else { ?>
 …
             <?php } ?>
             <?php wp_nonce_field( 'groups_create_save_group-avatar' ) ?>
+            <?php wp_nonce_field( 'groups_create_save_group-avatar' ) ?>
         <?php break; ?>
         <?php case 'group-invites': ?>
             <?php
+            <?php
             if ( bp_are_previous_group_creation_steps_complete( 'group-invites' ) ) {
                 $group_link = bp_get_group_permalink( $bp->groups->new_group );
                 if ( function_exists('friends_install') ) {
                     if ( friends_get_friend_count_for_user( $bp->loggedin_user->id ) ) {
 …
                 <?php wp_nonce_field( 'groups_step4_save' ) ?>
                 <?php
             } else { ?>
 …
         <?php break; ?>
     <?php } ?>
         <?php do_action( 'groups_custom_create_steps' ) // Allow plugins to add custom group creation steps ?>
         <div class="clear"></div>
         <div id="previous-next">
             <!-- Previous Button -->
 …
                  &nbsp; <input type="submit" value="<?php _e('Next Step', 'buddypress') ?> &rarr;" id="group-creation-next" name="save" />
             <?php endif;?>
             <!-- Create Button -->
             <?php if ( bp_is_first_group_creation_step() ) : ?>
                 <input type="submit" value="<?php _e('Create Group and Continue', 'buddypress') ?> &rarr;" id="group-creation-create" name="save" />
             <?php endif; ?>
             <!-- Finish Button -->
             <?php if ( bp_is_last_group_creation_step() ) : ?>
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     check_ajax_referer( 'groups_invite_uninvite_user' );
 …
     if ( !friends_check_friendship( $bp->loggedin_user->id, $_POST['friend_id'] ) )
         return false;
     if ( 'invite' == $_POST['friend_action'] ) {
         if ( !groups_invite_user( array( 'user_id' => $_POST['friend_id'], 'group_id' => $_POST['group_id'] ) ) )
             return false;
         $user = new BP_Core_User( $_POST['friend_id'] );
         echo '<li id="uid-' . $user->id . '">';
         echo $user->avatar_thumb;
 …
         echo '<span class="activity">' . attribute_escape( $user->last_active ) . '</span>';
         echo '<div class="action">
                 <a class="remove" href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . attribute_escape( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
+                <a class="remove" href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->groups->slug . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . attribute_escape( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
               </div>';
         echo '</li>';
     } else if ( 'uninvite' == $_POST['friend_action'] ) {
         if ( !groups_uninvite_user( $_POST['friend_id'], $_POST['group_id'] ) )
             return false;
         return true;
     } else {
         return false;
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     check_ajax_referer( 'group-filter-box' );
     locate_template( array( 'groups/group-loop.php' ), true );
+}
 …
         return false;
     ?>
     <?php if ( bp_group_has_members( 'group_id=' . $_REQUEST['group_id'] ) ) : ?>
         <?php if ( bp_group_member_needs_pagination() ) : ?>
             <div id="member-count" class="pag-count">
 …
             </div>
         <?php endif; ?>
         <ul id="member-list" class="item-list">
         <?php while ( bp_group_members() ) : bp_group_the_member(); ?>
 …
                 <h5><?php bp_group_member_link() ?></h5>
                 <span class="activity"><?php bp_group_member_joined_since() ?></span>
                 <?php if ( function_exists( 'friends_install' ) ) : ?>
                     <div class="action">
 …
         return false;
     ?>
     <?php if ( bp_group_has_members( 'group_id=' . $_REQUEST['group_id'] . '&per_page=' . $_REQUEST['num'] ) ) : ?>
         <?php if ( bp_group_member_needs_pagination() ) : ?>
             <div id="member-count" class="pag-count">
 …
             </div>
         <?php endif; ?>
         <ul id="members-list" class="item-list single-line">
         <?php while ( bp_group_members() ) : bp_group_the_member(); ?>
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     check_ajax_referer('directory_groups');
 …
     if ( groups_is_user_banned( $bp->loggedin_user->id, $_POST['gid'] ) )
         return false;
     if ( !$group = new BP_Groups_Group( $_POST['gid'], false, false ) )
         return false;
     if ( 'hidden' == $group->status )
         return false;
     if ( !groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
         if ( 'public' == $group->status ) {
             check_ajax_referer( 'groups_join_group' );
             if ( !groups_join_group( $group->id ) ) {
                 _e( 'Error joining group', 'buddypress' );
             } else {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+            }
+            }
         } else if ( 'private' == $group->status ) {
             check_ajax_referer( 'groups_request_membership' );
             if ( !groups_send_membership_request( $bp->loggedin_user->id, $group->id ) ) {
                 _e( 'Error requesting membership', 'buddypress' );
+                _e( 'Error requesting membership', 'buddypress' );
             } else {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
+            }
+                echo '<a id="group-' . attribute_escape( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
+            }
+        }
     } else {
         check_ajax_referer( 'groups_leave_group' );
         if ( !groups_leave_group( $group->id ) ) {
             _e( 'Error leaving group', 'buddypress' );
         } else {
             if ( 'public' == $group->status ) {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
+                echo '<a id="group-' . attribute_escape( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
             } else if ( 'private' == $group->status ) {
                 echo '<a id="group-' . attribute_escape( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . '/request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';

trunk/bp-loader.php

-                      r2042
+                      r2077
     include( BP_PLUGIN_DIR . '/bp-groups.php' );
 /* Private Messaging */
+/* Private Messaging */
 if ( !isset( $deactivated['bp-messages.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-messages.php') )
     include( BP_PLUGIN_DIR . '/bp-messages.php' );
 /* Wire Support */
 if ( !isset( $deactivated['bp-wire.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-wire.php') )
     include( BP_PLUGIN_DIR . '/bp-wire.php' );
 /* Extended Profiles */
+/* Extended Profiles */
 if ( !isset( $deactivated['bp-xprofile.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') )
     include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
 /* Status Updates */
+/* Status Updates */
 if ( !isset( $deactivated['bp-status.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-status.php') )
     include( BP_PLUGIN_DIR . '/bp-status.php' );

trunk/bp-messages.php

-                      r2020
+                      r2077
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
     require ( BP_PLUGIN_DIR . '/bp-messages/deprecated/bp-messages-deprecated.php' );
 function messages_install() {
     global $wpdb, $bp;
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     $sql[] = "CREATE TABLE {$bp->messages->table_name_threads} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
                 KEY last_sender_id (last_sender_id)
                ) {$charset_collate};";
     $sql[] = "CREATE TABLE {$bp->messages->table_name_recipients} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
                 KEY sender_id (sender_id)
                ) {$charset_collate};";
     $sql[] = "CREATE TABLE {$bp->messages->table_name_notices} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
                 KEY is_active (is_active)
                ) {$charset_collate};";
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta($sql);
     add_site_option( 'bp-messages-db-version', BP_MESSAGES_DB_VERSION );
+}
 …
     /* For internal identification */
     $bp->messages->id = 'messages';
     $bp->messages->table_name_threads = $wpdb->base_prefix . 'bp_messages_threads';
     $bp->messages->table_name_messages = $wpdb->base_prefix . 'bp_messages_messages';
 …
     do_action( 'messages_setup_globals' );
+}
 add_action( 'plugins_loaded', 'messages_setup_globals', 5 );
+add_action( 'plugins_loaded', 'messages_setup_globals', 5 );
 add_action( 'admin_menu', 'messages_setup_globals', 2 );
 function messages_check_installed() {
+function messages_check_installed() {
     global $wpdb, $bp;
     if ( !is_site_admin() )
         return false;
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
     if ( get_site_option('bp-messages-db-version') < BP_MESSAGES_DB_VERSION )
 …
     /* Add 'Messages' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __('Messages', 'buddypress'), 'slug' => $bp->messages->slug, 'position' => 50, 'show_for_displayed_user' => false, 'screen_function' => 'messages_screen_inbox', 'default_subnav_slug' => 'inbox', 'item_css_id' => $bp->messages->id ) );
     $messages_link = $bp->loggedin_user->domain . $bp->messages->slug . '/';
     /* Add the subnav items to the profile */
     bp_core_new_subnav_item( array( 'name' => __( 'Inbox', 'buddypress' ) . $count_indicator, 'slug' => 'inbox', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_inbox', 'position' => 10, 'user_has_access' => bp_is_home() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Sent Messages', 'buddypress' ), 'slug' => 'sentbox', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_sentbox', 'position' => 20, 'user_has_access' => bp_is_home() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Compose', 'buddypress' ), 'slug' => 'compose', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_compose', 'position' => 30, 'user_has_access' => bp_is_home() ) );
     if ( is_site_admin() )
         bp_core_new_subnav_item( array( 'name' => __( 'Notices', 'buddypress' ), 'slug' => 'notices', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_notices', 'position' => 90, 'user_has_access' => is_site_admin() ) );
 …
     if ( $bp->current_component == $bp->messages->slug ) {
         if ( bp_is_home() ) {
             $bp->bp_options_title = __( 'My Messages', 'buddypress' );
+            $bp->bp_options_title = __( 'My Messages', 'buddypress' );
         } else {
             $bp_options_avatar =  bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
 …
+        }
+    }
     do_action( 'messages_setup_nav' );
+}
 …
 function messages_screen_inbox() {
     do_action( 'messages_screen_inbox' );
     bp_core_load_template( apply_filters( 'messages_template_inbox', 'messages/index' ) );
+    bp_core_load_template( apply_filters( 'messages_template_inbox', 'messages/index' ) );
+}
 …
 function messages_screen_compose() {
     global $bp;
     // Remove any saved message data from a previous session.
     messages_remove_callback_values();
 …
     /* Check if the message form has been submitted */
     if ( isset( $_POST['send'] ) ) {
         /* Check the nonce */
         check_admin_referer( 'messages_send_message' );
         /* Check we have what we need */
         if ( empty( $_POST['subject'] ) || empty( $_POST['content'] ) ) {
 …
                 $typed_recipients = explode( ' ', $_POST['send_to_usernames'] );
                 $recipients = array_merge( (array) $autocomplete_recipients, (array) $typed_recipients );
                 /* Send the message */
                 if ( $thread_id = messages_new_message( array( 'recipients' => $recipients, 'subject' => $_POST['subject'], 'content' => $_POST['content'] ) ) ) {
 …
+    }
     do_action( 'messages_screen_compose' );
     bp_core_load_template( apply_filters( 'messages_template_compose', 'messages/compose' ) );
+}
 …
 function messages_screen_notices() {
     global $bp, $notice_id;
     if ( !is_site_admin() )
         return false;
     $notice_id = $bp->action_variables[1];
 …
         if ( 'deactivate' == $bp->action_variables[0] ) {
             if ( !$notice->deactivate() ) {
                 bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );
+                bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );
             } else {
                 bp_core_add_message( __('Notice deactivated.', 'buddypress') );
 …
         bp_core_redirect( $bp->loggedin_user->domain . $bp->messages->slug . '/notices' );
+    }
     do_action( 'messages_screen_notices' );
     bp_core_load_template( apply_filters( 'messages_template_notices', 'messages/notices' ) );
+}
 function messages_screen_notification_settings() {
+    bp_core_load_template( apply_filters( 'messages_template_notices', 'messages/notices' ) );
+}
+function messages_screen_notification_settings() {
     global $current_user; ?>
     <table class="notification-settings" id="messages-notification-settings">
 …
             <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
         <?php do_action( 'messages_screen_notification_settings' ) ?>
     </table>
 <?php
+<?php
+}
 add_action( 'bp_notification_settings', 'messages_screen_notification_settings', 2 );
 …
 function messages_action_view_message() {
     global $bp, $thread_id;
     if ( $bp->current_component != $bp->messages->slug || $bp->current_action != 'view' )
         return false;
     $thread_id = $bp->action_variables[0];
     if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access($thread_id) && !is_site_admin() ) )
         bp_core_redirect( $bp->displayed_user->domain . $bp->current_component );
     /* Check if a new reply has been submitted */
     if ( isset( $_POST['send'] ) ) {
         /* Check the nonce */
         check_admin_referer( 'messages_send_message', 'send_message_nonce' );
         /* Send the reply */
         if ( messages_new_message( array( 'thread_id' => $thread_id, 'subject' => $_POST['subject'], 'content' => $_POST['content'] ) ) )
 …
         else
             bp_core_add_message( __( 'There was a problem sending your reply, please try again', 'buddypress' ), 'error' );
         bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/view/' . $thread_id . '/' );
+    }
+        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/view/' . $thread_id . '/' );
+    }
     /* Mark message read */
     messages_mark_thread_read( $thread_id );
     do_action( 'messages_action_view_message' );
     bp_core_new_subnav_item( array( 'name' => sprintf( __( 'From: %s', 'buddypress'), BP_Messages_Thread::get_last_sender($thread_id) ), 'slug' => 'view', 'parent_url' => $bp->loggedin_user->domain . $bp->messages->slug . '/', 'parent_slug' => $bp->messages->slug, 'screen_function' => true, 'position' => 40, 'user_has_access' => bp_is_home() ) );
     bp_core_load_template( apply_filters( 'messages_template_view_message', 'messages/view' ) );
 …
 function messages_action_delete_message() {
     global $bp, $thread_id;
     if ( $bp->current_component != $bp->messages->slug || 'notices' == $bp->current_action || $bp->action_variables[0] != 'delete' )
         return false;
     $thread_id = $bp->action_variables[1];
 …
 function messages_action_bulk_delete() {
     global $bp, $thread_ids;
     if ( $bp->current_component != $bp->messages->slug || $bp->action_variables[0] != 'bulk-delete' )
         return false;
     $thread_ids = $_POST['thread_ids'];
     if ( !$thread_ids || !messages_check_thread_access($thread_ids) ) {
         bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/' . $bp->current_action );
+        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/' . $bp->current_action );
     } else {
         if ( !check_admin_referer( 'messages_delete_thread' ) )
             return false;
         if ( !messages_delete_thread( $thread_ids ) ) {
             bp_core_add_message( __('There was an error deleting messages.', 'buddypress'), 'error' );
 …
 function messages_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
     global $bp;
     if ( 'new_message' == $action ) {
         if ( (int)$total_items > 1 )
             return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="Inbox">' . sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+            return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="Inbox">' . sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
         else
             return apply_filters( 'bp_messages_single_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="Inbox">' . sprintf( __('You have %d new message', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+    }
     do_action( 'messages_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
     return false;
+}
 …
 function messages_new_message( $args = '' ) {
     global $bp;
     $defaults = array(
         'thread_id' => false, // false for a new message, thread id for a reply to a thread.
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
+    extract( $r, EXTR_SKIP );
     if ( !$sender_id || !$subject || !$content )
         return false;
     /* Create a new message object */
+    /* Create a new message object */
     $message = new BP_Messages_Message;
     $message->thread_id = $thread_id;
 …
     if ( $thread_id ) {
         $thread = new BP_Messages_Thread($thread_id);
         $message->recipients = $thread->get_recipients();
+        $message->recipients = $thread->get_recipients();
     } else {
         if ( empty( $recipients ) )
             return false;
         /* Loop the recipients and convert all usernames to user_ids where needed */
         foreach( (array) $recipients as $recipient ) {
             if ( is_numeric( trim( $recipient ) ) )
                 $recipient_ids[] = (int)trim( $recipient );
             if ( $recipient_id = bp_core_get_userid( trim( $recipient ) ) )
                 $recipient_ids[] = (int)$recipient_id;
 …
         /* Remove duplicates */
         $recipient_ids = array_unique( (array)$recipient_ids );
         if ( empty( $recipient_ids ) )
             return false;
         $message->recipients = $recipient_ids;
+    }
+        $message->recipients = $recipient_ids;
+    }
     if ( $message->send() ) {
         require_once( BP_PLUGIN_DIR . '/bp-messages/bp-messages-notifications.php' );
 …
         // Send screen notifications to the recipients
         foreach ( (array)$message->recipients as $recipient ) {
             bp_core_add_notification( $message->id, $recipient, 'messages', 'new_message' );
+        }
+            bp_core_add_notification( $message->id, $recipient, 'messages', 'new_message' );
+        }
         // Send email notifications to the recipients
         messages_notification_new_message( array( 'item_id' => $message->id, 'recipient_ids' => $message->recipients, 'thread_id' => $message->thread_id, 'component_name' => $bp->messages->slug, 'component_action' => 'message_sent', 'is_private' => 1 ) );
         do_action( 'messages_message_sent', &$message );
         return $message->thread_id;
+    }
     return false;
+}
 …
         $notice->is_active = 1;
         $notice->save(); // send it.
         do_action( 'messages_send_notice', $subject, $message );
         return true;
+    }
 …
                 $error = 1;
+        }
         if ( $error )
             return false;
         do_action( 'messages_delete_thread', $thread_ids );
         return true;
     } else {
         if ( !BP_Messages_Thread::delete($thread_ids) )
             return false;
         do_action( 'messages_delete_thread', $thread_ids );
         return true;
+    }
 …
 function messages_check_thread_access( $thread_id, $user_id = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     return BP_Messages_Thread::check_access( $thread_id, $user_id );
+}
 …
 function messages_mark_thread_unread( $thread_id ) {
     return BP_Messages_Thread::mark_as_unread( $thread_id );
+    return BP_Messages_Thread::mark_as_unread( $thread_id );
+}
 …
 function messages_get_unread_count( $user_id = false ) {
     global $bp;
     if ( !$user_id )
+    if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     return BP_Messages_Thread::get_inbox_count( $user_id );
+}

trunk/bp-messages/bp-messages-classes.php

-                      r2020
+                      r2077
 <?php
 Class BP_Messages_Thread {
+Class BP_Messages_Thread {
     var $thread_id;
     var $message_ids;
     var $first_post_date;
     var $last_post_date;
     var $last_sender_id;
 …
     var $last_message_message;
     var $last_message_date_sent;
     var $messages = null;
     var $has_access = false;
     var $unread_count = 0;
     var $recipients = null;
     var $box;
     var $get_all_messages;
     function bp_messages_thread( $id = null, $get_all_messages = false, $box = 'inbox' ) {
         $this->box = $box;
         $this->get_all_messages = $get_all_messages;
         if ( $id ) {
             $this->populate( $id );
+        }
         if ( $this->get_all_messages ) {
             $this->messages = $this->get_messages();
 …
+        }
+    }
     function populate( $id ) {
+    function populate( $id ) {
         global $wpdb, $bp;
         $thread = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_threads} WHERE id = %d", $id ) );
         if ( $thread ) {
             // If we're only viewing a thread in a list of threads, don't bother using
             // up resources checking if we have access. Only check if we're viewing the full
 …
                 // filter the users messages out
                 if ( !$this->get_all_messages ) {
                     // Flip the array to start from the newest message
                     $this->message_ids = array_reverse( $this->message_ids );
                     foreach ( $this->message_ids as $key => $message_id ) {
                         if ( 'sentbox' == $this->box ) {
 …
                             } else {
                                 break;
+                            }
+                            }
                         } else {
                             if ( messages_is_user_sender( $bp->loggedin_user->id, $message_id ) ) {
 …
                             } else {
                                 break;
+                            }
+                            }
+                        }
+                    }
 …
                 $this->first_post_date = $thread->first_post_date;
                 $this->last_post_date = $thread->last_post_date;
                 if ( !empty($this->message_ids) )
                     $this->message_ids = implode( ',', $this->message_ids );
                 else
                     $this->message_ids = false;
                 $this->unread_count = $this->get_unread();
                 $last_message = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $this->last_message_id ) );
+                $last_message = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $this->last_message_id ) );
                 if ( $last_message ) {
                     $this->last_message_subject = $last_message->subject;
 …
                     $this->last_message_date_sent = $last_message->date_sent;
+                }
                 $this->recipients = $this->get_recipients();
+            }
+        }
+    }
     function get_messages() {
         global $wpdb, $bp;
         if ( $this->message_ids)
             return $wpdb->get_results( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id IN (" . $wpdb->escape($this->message_ids) . ")" );
 …
         $sql = $wpdb->prepare( "SELECT unread_count FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $this->thread_id, $bp->loggedin_user->id );
         $unread_count = $wpdb->get_var($sql);
         return $unread_count;
+    }
     function mark_read() {
         BP_Messages_Thread::mark_as_read($this->thread_id);
+    }
     function mark_unread() {
         BP_Messages_Thread::mark_as_unread($this->thread_id);
+    }
     function get_recipients() {
         global $wpdb, $bp;
 …
                 $recipient_ids[] = $recipient;
+        }
         return $recipient_ids;
+    }
     /** Static Functions **/
     function delete( $thread_id ) {
         global $wpdb, $bp;
         $delete_for_user = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET is_deleted = 1 WHERE thread_id = %d AND user_id = %d", $thread_id, $bp->loggedin_user->id ) );
         // Check to see if any more recipients remain for this message
         // if not, then delete the message from the database.
 …
             $message_ids = $wpdb->get_var( $wpdb->prepare( "SELECT message_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
             $message_ids = unserialize($message_ids);
             // delete thread:
             $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
             // delete messages:
             for ( $i = 0; $i < count($message_ids); $i++ ) {
                 $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_ids[$i] ) );
+            }
             // delete the recipients
             $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_recipients} WHERE id = %d", $thread_id ) );
 …
         return true;
+    }
     function get_current_threads_for_user( $user_id, $box = 'inbox', $limit = null, $page = null, $type = 'all' ) {
         global $wpdb, $bp;
 …
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         if ( $type == 'unread' )
             $type_sql = $wpdb->prepare( " AND r.unread_count != 0 " );
         else if ( $type == 'read' )
             $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
         $sql = $wpdb->prepare( "SELECT r.thread_id FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_threads} t WHERE t.id = r.thread_id AND r.is_deleted = 0 AND r.user_id = %d$exclude_sender $type_sql ORDER BY t.last_post_date DESC$pag_sql", $bp->loggedin_user->id );
         if ( !$thread_ids = $wpdb->get_results($sql) )
             return false;
         $threads = false;
         for ( $i = 0; $i < count($thread_ids); $i++ ) {
             $threads[$i] = new BP_Messages_Thread( $thread_ids[$i]->thread_id, false, $box );
 …
         // reset keys
         return array_reverse( array_reverse( $threads ) );
+    }
+        return array_reverse( array_reverse( $threads ) );
+    }
     function mark_as_read( $thread_id ) {
         global $wpdb, $bp;
         $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", $bp->loggedin_user->id, $thread_id );
         $wpdb->query($sql);
+    }
     function mark_as_unread( $thread_id ) {
         global $wpdb, $bp;
         $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", $bp->loggedin_user->id, $thread_id );
         $wpdb->query($sql);
+    }
     function get_total_threads_for_user( $user_id, $box = 'inbox', $type = 'all' ) {
         global $wpdb, $bp;
 …
         if ( $box != 'sentbox' )
             $exclude_sender = ' AND sender_only != 1';
         if ( $type == 'unread' )
             $type_sql = $wpdb->prepare( " AND unread_count != 0 " );
 …
         return (int) $wpdb->get_var( $wpdb->prepare( "SELECT count(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0$exclude_sender $type_sql", $user_id ) );
+    }
     function user_is_sender($thread_id) {
         global $wpdb, $bp;
         $sender_ids = $wpdb->get_var( $wpdb->prepare( "SELECT sender_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
+        $sender_ids = $wpdb->get_var( $wpdb->prepare( "SELECT sender_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
         if ( !$sender_ids )
             return false;
         $sender_ids = unserialize($sender_ids);
         return in_array( $bp->loggedin_user->id, $sender_ids );
+    }
 …
         $sql = $wpdb->prepare("SELECT last_sender_id FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id);
         if ( !$sender_id = $wpdb->get_var($sql) )
             return false;
         return bp_core_get_userlink( $sender_id, true );
+    }
     function get_inbox_count() {
         global $wpdb, $bp;
 …
         if ( !$unread_counts = $wpdb->get_results($sql) )
             return false;
         $count = 0;
         for ( $i = 0; $i < count($unread_counts); $i++ ) {
             $count += $unread_counts[$i]->unread_count;
+        }
         return $count;
+    }
     function check_access( $thread_id, $user_id = false ) {
         global $wpdb, $bp;
         if ( !$user_id )
             $user_id = $bp->loggedin_user->id;
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $thread_id, $user_id ) );
+    }
 …
     function is_valid( $thread_id ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
+    }
     function get_recipient_links($recipients) {
         if ( count($recipients) >= 5 )
 …
     var $message;
     var $date_sent;
     var $thread_id;
     var $recipients = false;
 …
+        }
+    }
     function populate( $id ) {
         global $wpdb, $bp;
         $sql = $wpdb->prepare("SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $id);
 …
+    }
     function send() {
         global $wpdb, $bp;
+    function send() {
+        global $wpdb, $bp;
         $this->sender_id = apply_filters( 'messages_message_sender_id_before_save', $this->sender_id, $this->id );
         $this->subject = apply_filters( 'messages_message_subject_before_save', $this->subject, $this->id );
         $this->message = apply_filters( 'messages_message_content_before_save', $this->message, $this->id );
         $this->date_sent = apply_filters( 'messages_message_date_sent_before_save', $this->date_sent, $this->id );
+        $this->date_sent = apply_filters( 'messages_message_date_sent_before_save', $this->date_sent, $this->id );
         do_action( 'messages_message_before_save', $this );
         // First insert the message into the messages table
         if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( sender_id, subject, message, date_sent ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d) )", $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
             return false;
         // Next, if thread_id is set, we are adding to an existing thread, if not, start a new one.
         if ( $this->thread_id ) {
 …
             $message_ids[] = $wpdb->insert_id;
             $message_ids = serialize($message_ids);
             // We need this so we can return the new message ID.
             $message_id = $wpdb->insert_id;
             // Update the sender ids for the thread
             $sender_ids = unserialize($the_ids->sender_ids);
 …
             if ( !in_array( $this->sender_id, $sender_ids ) || !$sender_ids )
                 $sender_ids[] = $this->sender_id;
             $sender_ids = serialize($sender_ids);
+            $sender_ids = serialize($sender_ids);
             // Update the thread the message belongs to.
             $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_threads} SET message_ids = %s, sender_ids = %s, last_message_id = %d, last_sender_id = %d, last_post_date = FROM_UNIXTIME(%d) WHERE id = %d", $message_ids, $sender_ids, $wpdb->insert_id, $this->sender_id, $this->date_sent, $this->thread_id ) );
             // Find the recipients and update the unread counts for each
             if ( !$this->recipients )
                 $this->recipients = $this->get_recipients();
             for ( $i = 0; $i < count($this->recipients); $i++ ) {
                 if ( $this->recipients[$i]->user_id != $bp->loggedin_user->id )
 …
             $serialized_message_id = serialize( array( (int)$message_id ) );
             $serialized_sender_id = serialize( array( (int)$bp->loggedin_user->id ) );
             $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_threads} ( message_ids, sender_ids, first_post_date, last_post_date, last_message_id, last_sender_id ) VALUES ( %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d, %d )", $serialized_message_id, $serialized_sender_id, $this->date_sent, $this->date_sent, $message_id, $this->sender_id );
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_threads} ( message_ids, sender_ids, first_post_date, last_post_date, last_message_id, last_sender_id ) VALUES ( %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d, %d )", $serialized_message_id, $serialized_sender_id, $this->date_sent, $this->date_sent, $message_id, $this->sender_id );
             if ( false === $wpdb->query($sql) )
                 return false;
             $this->thread_id = $wpdb->insert_id;
             // Add a new entry for each recipient;
             for ( $i = 0; $i < count($this->recipients); $i++ ) {
                 $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count ) VALUES ( %d, %d, 1 )", $this->recipients[$i], $this->thread_id ) );
+            }
             if ( !in_array( $this->sender_id, (array)$this->recipients ) ) {
                 // Finally, add a recipient entry for the sender, as replies need to go to this person too.
 …
+            }
+        }
         $this->id = $message_id;
         messages_remove_callback_values();
         do_action( 'messages_message_after_save', $this );
         return $this->thread_id;
+    }
     function get_recipients() {
         global $bp, $wpdb;
         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) );
+    }
     // Static Functions
     function get_recipient_ids( $recipient_usernames ) {
         if ( !$recipient_usernames )
             return false;
         if ( is_array($recipient_usernames) ) {
             for ( $i = 0; $i < count($recipient_usernames); $i++ ) {
 …
+            }
+        }
         return $recipient_ids;
+    }
     function get_last_sent_for_user( $thread_id ) {
         global $wpdb, $bp;
         $message_ids = $wpdb->get_var( $wpdb->prepare( "SELECT message_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $thread_id ) );
         $message_ids = implode( ',', unserialize($message_ids));
 …
         $sql = $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages}  WHERE sender_id = %d AND id IN (" . $wpdb->escape($message_ids) . ") ORDER BY date_sent DESC LIMIT 1", $bp->loggedin_user->id );
         return $wpdb->get_var($sql);
+    }
+    }
     function is_user_sender( $user_id, $message_id ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND id = %d", $user_id, $message_id ) );
+    }
     function get_message_sender( $message_id ) {
         global $wpdb, $bp;
         return $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_id ) );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_id ) );
+    }
+}
 …
     var $date_sent;
     var $is_active;
     function bp_messages_notice($id = null) {
         if ( $id ) {
 …
+        }
+    }
     function populate() {
         global $wpdb, $bp;
         $notice = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} WHERE id = %d", $this->id ) );
         if ( $notice ) {
             $this->subject = $notice->subject;
 …
+        }
+    }
     function save() {
         global $wpdb, $bp;
         $this->subject = apply_filters( 'messages_notice_subject_before_save', $this->subject, $this->id );
         $this->message = apply_filters( 'messages_notice_message_before_save', $this->message, $this->id );
         do_action( 'messages_notice_before_save', $this );
         if ( !$this->id ) {
             $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_notices} (subject, message, date_sent, is_active) VALUES (%s, %s, FROM_UNIXTIME(%d), %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_notices} (subject, message, date_sent, is_active) VALUES (%s, %s, FROM_UNIXTIME(%d), %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );
         } else {
             $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET subject = %s, message = %s, is_active = %d WHERE id = %d", $this->subject, $this->message, $this->is_active, $this->id );
+        }
+            $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET subject = %s, message = %s, is_active = %d WHERE id = %d", $this->subject, $this->message, $this->is_active, $this->id );
+        }
         if ( !$wpdb->query($sql) )
             return false;
         if ( !$id = $this->id )
             $id = $wpdb->insert_id;
         // Now deactivate all notices apart from the new one.
         $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET is_active = 0 WHERE id != %d", $id ) );
         update_usermeta( $bp->loggedin_user->id, 'last_activity', date( 'Y-m-d H:i:s' ) );
+        update_usermeta( $bp->loggedin_user->id, 'last_activity', date( 'Y-m-d H:i:s' ) );
         do_action( 'messages_notice_after_save', $this );
         return true;
+    }
     function activate() {
         $this->is_active = 1;
         if ( !$this->save() )
             return false;
         return true;
+    }
     function deactivate() {
         $this->is_active = 0;
         if ( !$this->save() )
             return false;
         return true;
+    }
     function delete() {
         global $wpdb, $bp;
         $sql = $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_notices} WHERE id = %d", $this->id );
         if ( !$wpdb->query($sql) )
             return false;
         return true;
+    }
+        return true;
+    }
     // Static Functions
     function get_notices() {
         global $wpdb, $bp;
         $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC" ) );
         return $notices;
+    }
     function get_total_notice_count() {
         global $wpdb, $bp;
         $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp->messages->table_name_notices ) );
         return $notice_count;
+    }
     function get_active() {
         global $wpdb, $bp;
         $notice_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1") );
         return new BP_Messages_Notice($notice_id);

trunk/bp-messages/bp-messages-cssjs.php

-                      r1905
+                      r2077
 function messages_add_autocomplete_js() {
     global $bp;
     // Include the autocomplete JS for composing a message.
     if ( $bp->current_component == $bp->messages->slug && 'compose' == $bp->current_action ) {
         add_action( 'wp_head', 'messages_autocomplete_init_jsblock' );
         wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocomplete.js', array( 'jquery' ) );
         wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocompletefb.js' );
         wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.bgiframe.min.js' );
         wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.dimensions.js' );
+        wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.dimensions.js' );
+    }
 …
     if ( $bp->current_component == $bp->messages->slug && 'compose' == $bp->current_action ) {
         wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . '/bp-messages/css/autocomplete/jquery.autocompletefb.css' );
+        wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . '/bp-messages/css/autocomplete/jquery.autocompletefb.css' );
         wp_print_styles();
+    }
 …
     <script type="text/javascript">
         jQuery(document).ready(function() {
             var acfb =
+            var acfb =
             jQuery("ul.first").autoCompletefb({urlLookup:'<?php echo $bp->root_domain . str_replace( 'index.php', 'wp-load.php', $_SERVER['SCRIPT_NAME'] ) ?>'});

trunk/bp-messages/bp-messages-notifications.php

-                      r1905
+                      r2077
     global $bp;
     extract($args);
     $message = new BP_Messages_Message( $item_id );
     $sender_name = bp_core_get_user_displayname( $message->sender_id );
 …
         $ud = get_userdata( $recipient_ids[$i] );
         $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'messages/view/' . $message->id;
         $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'settings/notifications';
+        $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'messages/view/' . $message->id;
+        $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'settings/notifications';
         // Set up and send the message
         $to = $ud->user_email;
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), stripslashes( $sender_name ) );
         $content = sprintf( __(
+        $content = sprintf( __(
 '%s sent you a new message:
 …
     $users = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_email, user_login FROM {$wpdb->base_prefix}users WHERE user_status = 0 AND spam = 0 AND deleted = 0" ) );
     for ( $i = 0; $i < count($users); $i++ ) {
         if ( get_usermeta( $users[$i]->user_id, 'notification_messages_new_notice' ) == 'no' ) continue;
         $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'messages';
         $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'settings/notifications';
+        $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'messages';
+        $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'settings/notifications';
         // Set up and send the message
 …
         $subject = __( 'New Site Notice', 'buddypress' );
         $message = sprintf( __(
+        $message = sprintf( __(
 'A new site notice has been posted on %s:
 …
         // Send it
         wp_mail( $to, $subject, $message );
         unset($message);
         unset($subject);

trunk/bp-messages/bp-messages-templatetags.php

-                      r1989
+                      r2077
     var $threads;
     var $thread;
     var $in_the_loop;
     var $user_id;
     var $box;
     var $pag_page;
     var $pag_num;
 …
         $this->user_id = $user_id;
         $this->box = $box;
         if ( 'notices' == $this->box )
             $this->threads = BP_Messages_Notice::get_notices();
         else
             $this->threads = BP_Messages_Thread::get_current_threads_for_user( $this->user_id, $this->box, $this->pag_num, $this->pag_page, $type );
         if ( !$this->threads ) {
             $this->thread_count = 0;
             $this->total_thread_count = 0;
         } else {
+        } else {
             $total_notice_count = BP_Messages_Notice::get_total_notice_count();
             if ( !$max || $max >= (int)$total_notice_count ) {
                 if ( 'notices' == $this->box )
 …
                 $this->total_thread_count = (int)$max;
+            }
             if ( $max ) {
                 if ( $max >= count($this->threads) )
 …
         ));
+    }
     function has_threads() {
         if ( $this->thread_count )
             return true;
         return false;
+    }
     function next_thread() {
         $this->current_thread++;
         $this->thread = $this->threads[$this->current_thread];
         return $this->thread;
+    }
     function rewind_threads() {
         $this->current_thread = -1;
 …
+        }
+    }
     function message_threads() {
+    function message_threads() {
         if ( $this->current_thread + 1 < $this->thread_count ) {
             return true;
 …
         return false;
+    }
     function the_message_thread() {
         global $thread;
 …
 function bp_has_message_threads( $args = '' ) {
     global $bp, $messages_template;
     $defaults = array(
         'user_id' => $bp->loggedin_user->id,
 …
         if ( 'inbox' == $bp->current_action )
             bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'messages', 'new_message' );
         if ( 'sentbox' == $bp->current_action )
             $box = 'sentbox';
 …
         if ( 'notices' == $bp->current_action )
             $box = 'notices';
         $messages_template = new BP_Messages_Box_Template( $user_id, $box, $per_page, $max, $type );
+    }
     return apply_filters( 'bp_has_message_threads', $messages_template->has_threads(), &$messages_template );
+}
 function bp_message_threads() {
+function bp_message_threads() {
     global $messages_template;
     return $messages_template->message_threads();
 …
         return apply_filters( 'bp_get_message_thread_view_link', $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . $messages_template->thread->thread_id );
+    }
 function bp_message_thread_delete_link() {
     echo bp_get_message_thread_delete_link();
 …
         return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id, 'messages_delete_thread' ) );
+    }
 function bp_message_thread_has_unread() {
     global $messages_template;
 …
     if ( $messages_template->thread->unread_count )
         return true;
     return false;
+}
 …
     function bp_get_message_thread_unread_count() {
         global $messages_template;
         if ( (int)$messages_template->thread->unread_count )
             return apply_filters( 'bp_get_message_thread_unread_count', $messages_template->thread->unread_count );
         return false;
+    }
 …
     echo sprintf( __( 'Viewing message %d to %d (of %d messages)', 'buddypress' ), $from_num, $to_num, $messages_template->total_thread_count ); ?> &nbsp;
     <span class="ajax-loader"></span><?php
+    <span class="ajax-loader"></span><?php
+}
 …
 function bp_messages_options() {
     global $bp;
     if ( $bp->current_action != 'sentbox' ) {
 ?>
         <?php _e( 'Select:', 'buddypress' ) ?>
+        <?php _e( 'Select:', 'buddypress' ) ?>
         <select name="message-type-select" id="message-type-select">
             <option value=""></option>
 …
     <?php } ?>
         <a href="#" id="delete_<?php echo $bp->current_action ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
 <?php
+<?php
+}
 function bp_message_is_active_notice() {
     global $messages_template;
     if ( $messages_template->thread->is_active ) {
         echo "<strong>";
 …
         if ( $messages_template->thread->is_active )
             return true;
         return false;
+    }
 …
             $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id, 'messages_deactivate_notice' );
         } else {
             $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id, 'messages_activate_notice' );
+            $link = wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id, 'messages_activate_notice' );
+        }
         return apply_filters( 'bp_get_message_activate_deactivate_link', $link );
 …
             $text = __('Deactivate', 'buddypress');
         } else {
             $text = __('Activate', 'buddypress');
+            $text = __('Activate', 'buddypress');
+        }
         return apply_filters( 'bp_message_activate_deactivate_text', $text );
 …
 function bp_message_get_notices() {
     global $userdata;
     $notice = BP_Messages_Notice::get_active();
     $closed_notices = get_usermeta( $userdata->ID, 'closed_notices');
 …
             </div>
             <?php
+        }
+        }
+    }
+}
 …
     function bp_get_send_message_button() {
         global $bp;
         if ( bp_is_home() || !is_user_logged_in() )
             return false;
         $ud = get_userdata( $bp->displayed_user->id );
+        $ud = get_userdata( $bp->displayed_user->id );
         return apply_filters( 'bp_get_send_message_button', '<div class="generic-button"><a class="send-message" title="' . __( 'Send Message', 'buddypress' ) . '" href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/compose/?r=' . $ud->user_login . '">' . __( 'Send Message', 'buddypress' ) . '</a></div>' );
+    }
 …
 function bp_message_get_recipient_tabs() {
     global $bp;
     if ( isset( $_GET['r'] ) ) {
         $user_id = bp_core_get_userid( $_GET['r'] );
         if ( $user_id ) {
             ?>
 …
                     <?php echo bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) ) ?>
                     <?php echo bp_core_get_userlink( $user_id ) ?>
                 </span>
+                </span>
             </li>
             <?php
 …
     var $message_count;
     var $message;
     var $thread;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_message_count;
     function bp_messages_thread_template( $thread_id, $order ) {
         global $bp;
         $this->thread = new BP_Messages_Thread( $thread_id, true );
         $this->message_count = count( $this->thread->messages );
+    }
     function has_messages() {
         if ( $this->message_count )
             return true;
         return false;
+    }
     function next_message() {
         $this->current_message++;
         $this->message = $this->thread->messages[$this->current_message];
         return $this->message;
+    }
     function rewind_messages() {
         $this->current_message = -1;
 …
+        }
+    }
     function messages() {
+    function messages() {
         if ( $this->current_message + 1 < $this->message_count ) {
             return true;
 …
         return false;
+    }
     function the_message() {
         global $message;
 …
 function bp_thread_has_messages( $args = '' ) {
     global $bp, $thread_template, $group_id;
     $defaults = array(
         'thread_id' => false,
 …
 function bp_thread_messages() {
     global $thread_template;
     return $thread_template->messages();
+}
 …
 function bp_thread_the_message() {
     global $thread_template;
     return $thread_template->the_message();
+}
 …
     function bp_get_the_thread_id() {
         global $thread_template;
         return apply_filters( 'bp_get_the_thread_id', $thread_template->thread->thread_id );
+    }
 …
     function bp_get_the_thread_recipients() {
         global $thread_template;
         if ( count($thread_template->thread->recipients) >= 5 )
             return apply_filters( 'bp_get_the_thread_recipients', sprintf( __( '%d Recipients', 'buddypress' ), count($thread_template->thread->recipients) ) );
         foreach( $thread_template->thread->recipients as $recipient )
             $recipient_links[] = bp_core_get_userlink( $recipient );
 …
     function bp_get_the_thread_message_alt_class() {
         global $thread_template;
         if ( $thread_template->current_message % 2 == 1 )
             $class = ' alt';
         else
             $class = '';
         return apply_filters( 'bp_get_the_thread_message_alt_class', $class );
+    }
 function bp_the_thread_message_sender_avatar( $args = '' ) {
     echo bp_get_the_thread_message_sender_avatar_thumb( $args );
+}
     function bp_get_the_thread_message_sender_avatar_thumb( $args = '' ) {
         global $thread_template;
+        global $thread_template;
         $defaults = array(
             'type' => 'thumb',
 …
     function bp_get_the_thread_message_sender_link() {
         global $thread_template;
         return apply_filters( 'bp_get_the_thread_message_sender_link', bp_core_get_userlink( $thread_template->message->sender_id, false, true ) );
+    }
 function bp_the_thread_message_sender_name() {
     echo bp_get_the_thread_message_sender_name();
 …
     function bp_get_the_thread_message_sender_name() {
         global $thread_template;
         return apply_filters( 'bp_get_the_thread_message_sender_name', bp_core_get_user_displayname( $thread_template->message->sender_id ) );
+        return apply_filters( 'bp_get_the_thread_message_sender_name', bp_core_get_user_displayname( $thread_template->message->sender_id ) );
+    }
 …
     function bp_get_the_thread_message_time_since() {
         global $thread_template;
         return apply_filters( 'bp_get_the_thread_message_time_since', sprintf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( strtotime( $thread_template->message->date_sent ) ) ) );
+    }
 …
     function bp_get_the_thread_message_content() {
         global $thread_template;
         return apply_filters( 'bp_get_the_thread_message_content', $thread_template->message->message );
+    }
+        return apply_filters( 'bp_get_the_thread_message_content', $thread_template->message->message );
+    }
 /*** DEPRECATED FUNCTIONS (DO NOT USE) **********************************************************/
 /* DEPRECATED - please use the view message template loop. */
+/* DEPRECATED - please use the view message template loop. */
 function messages_view_thread( $thread_id ) {
     global $bp;
     $thread = new BP_Messages_Thread( $thread_id, true );
     if ( !$thread->has_access ) {
         unset($_GET['mode']); ?>
 …
             <p><?php _e( 'There was an error when viewing that message', 'buddypress' ) ?></p>
         </div>
     <?php
+    <?php
     } else {
         if ( $thread->messages ) { ?>
             <?php $thread->mark_read() ?>
             <div class="wrap">
                 <h2 id="message-subject"><?php echo $thread->subject; ?></h2>
 …
                             <td>
                                 <img src="<?php echo $bp->messages->image_base ?>/email_open.gif" alt="Message" style="vertical-align: top;" /> &nbsp;
                                 <?php _e('Sent between ', 'buddypress') ?> <?php echo BP_Messages_Thread::get_recipient_links($thread->recipients) ?>
                                 <?php _e('and', 'buddypress') ?> <?php echo bp_core_get_userlink($bp->loggedin_user->id) ?>.
+                                <?php _e('Sent between ', 'buddypress') ?> <?php echo BP_Messages_Thread::get_recipient_links($thread->recipients) ?>
+                                <?php _e('and', 'buddypress') ?> <?php echo bp_core_get_userlink($bp->loggedin_user->id) ?>.
                             </td>
                         </tr>
                     </tbody>
                 </table>
         <?php
             $counter = 0;
             foreach ( $thread->messages as $message ) {
                 $alt = ( $counter % 2 == 1 ) ? ' alt' : '';
 …
                             <small><?php echo apply_filters( 'bp_get_message_date_sent', bp_format_time( strtotime($message->date_sent ) ) ) ?></small>
                         </div>
                         <?php do_action( 'messages_custom_fields_output_before' ) ?>
                         <?php echo apply_filters( 'bp_get_the_message_thread_content', stripslashes($message->message) ); ?>
                         <?php do_action( 'messages_custom_fields_output_after' ) ?>
                         <div class="clear"></div>
                     </div>
 …
                 $counter++;
+            }
             ?>
                 <form id="send-reply" action="<?php bp_messages_form_action() ?>" method="post">
 …
                                 <div class="avatar-box">
                                     <?php echo  bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => 'thumb' ) ); ?>
                                     <h3><?php _e("Reply: ", 'buddypress') ?></h3>
                                 </div>
 …
                             <input type="hidden" name="subject" id="subject" value="<?php _e('Re: ', 'buddypress'); echo str_replace( 'Re: ', '', $thread->last_message_subject); ?>" />
                     </div>
                     <?php wp_nonce_field( 'messages_send_message', '_wpnonce_send_message' ) ?>
                 </form>

trunk/bp-messages/deprecated/bp-messages-deprecated.php

-                      r1957
+                      r2077
+ *
  * This file contains functions that are deprecated.
  * You should not under any circumstance use these functions as they are
+ * You should not under any circumstance use these functions as they are
  * either no longer valid, or have been replaced with something much more awesome.
+ *
 …
  * Of course, things will still work if you use these functions but you will
  * be the laughing stock of the BuddyPress community. We will all point and laugh at
  * you. You'll also be making things harder for yourself in the long run,
+ * you. You'll also be making things harder for yourself in the long run,
  * and you will miss out on lovely performance and functionality improvements.
+ *
+ *
  * If you've checked you are not using any deprecated functions and finished your little
  * dance, you can add the following line to your wp-config.php file to prevent any of
 …
 function messages_deprecated_globals() {
     global $bp;
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
 …
     $bp->groups->image_base = BP_PLUGIN_URL . '/bp-messages/deprecated/images';
+}
 add_action( 'plugins_loaded', 'messages_deprecated_globals', 5 );
+add_action( 'plugins_loaded', 'messages_deprecated_globals', 5 );
 add_action( 'admin_menu', 'messages_deprecated_globals', 2 );
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $template;
     /* Enqueue the structure CSS file to give basic positional formatting for components */
     wp_enqueue_style( 'bp-messages-structure', BP_PLUGIN_URL . '/bp-messages/deprecated/css/structure.css' );
+    wp_enqueue_style( 'bp-messages-structure', BP_PLUGIN_URL . '/bp-messages/deprecated/css/structure.css' );
+}
 add_action( 'bp_styles', 'messages_add_structure_css' );
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     check_ajax_referer( 'messages_send_message' );
     $result = messages_send_message($_REQUEST['send_to'], $_REQUEST['subject'], $_REQUEST['content'], $_REQUEST['thread_id'], true, false, true);
+    $result = messages_send_message($_REQUEST['send_to'], $_REQUEST['subject'], $_REQUEST['content'], $_REQUEST['thread_id'], true, false, true);
     if ( $result['status'] ) { ?>
             <div class="avatar-box">
                 <?php echo bp_core_fetch_avatar( array( 'item_id' => $result['reply']->sender_id, 'type' => 'thumb' ) ); ?>
                 <h3><?php echo bp_core_get_userlink($result['reply']->sender_id) ?></h3>
                 <small><?php echo bp_format_time($result['reply']->date_sent) ?></small>
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     if ( !isset($_POST['thread_ids']) ) {
         echo "-1[[split]]" . __('There was a problem marking messages as unread.', 'buddypress');
     } else {
         $thread_ids = explode( ',', $_POST['thread_ids'] );
         for ( $i = 0; $i < count($thread_ids); $i++ ) {
             BP_Messages_Thread::mark_as_unread($thread_ids[$i]);
 …
     /* If we are using a BuddyPress 1.1+ theme ignore this. */
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
+        return false;
     if ( !isset($_POST['thread_ids']) ) {
         echo "-1[[split]]" . __('There was a problem marking messages as read.', 'buddypress');
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     if ( !isset($_POST['thread_ids']) ) {
         echo "-1[[split]]" . __( 'There was a problem deleting messages.', 'buddypress' );
 …
             BP_Messages_Thread::delete($thread_ids[$i]);
+        }
         _e('Messages deleted.', 'buddypress');
+    }
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     if ( !isset($_POST['notice_id']) ) {
         echo "-1[[split]]" . __('There was a problem closing the notice.', 'buddypress');
     } else {
         $notice_ids = get_usermeta( $userdata->ID, 'closed_notices' );
         $notice_ids[] = (int) $_POST['notice_id'];
         update_usermeta( $userdata->ID, 'closed_notices', $notice_ids );
+    }
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
     $friends = false;
 …
             echo bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) )  . ' ' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
             ';
+        }
+        }
+    }
+}
 …
     global $message, $type;
     global $bp, $current_user;
     messages_add_callback_values( $recipients, $subject, $content );
     if ( isset( $_POST['send-notice'] ) ) {
         if ( messages_send_notice( $subject, $content, $from_template ) ) {
             bp_core_add_message( __('Notice posted successfully.', 'buddypress') );
         } else {
             bp_core_add_message( __('There was an error posting that notice.', 'buddypress'), 'error' );
+            bp_core_add_message( __('There was an error posting that notice.', 'buddypress'), 'error' );
+        }
         bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/notices' );
         return true;
+    }
     $recipients = explode( ' ', $recipients );
     // If there are no recipients
     if ( count( $recipients ) < 1 ) {
         if ( !$from_ajax ) {
+        if ( !$from_ajax ) {
             bp_core_add_message( __('Please enter at least one valid user to send this message to.', 'buddypress'), 'error' );
             bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
 …
             return array('status' => 0, 'message' => __('There was an error sending the reply, please try again.', 'buddypress'));
+        }
     // If there is only 1 recipient and it is the logged in user.
     } else if ( 1 == count( $recipients ) && $recipients[0] == $current_user->user_login ) {
         bp_core_add_message( __('You must send your message to one or more users not including yourself.', 'buddypress'), 'error' );
         bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
     // If the subject or content boxes are empty.
     } else if ( empty( $subject ) || empty( $content ) ) {
 …
             return array('status' => 0, 'message' => __('Please make sure you have typed a message before sending a reply.', 'buddypress'));
+        }
     // Passed validation continue.
     } else {
 …
         if ( $key = array_search( $current_user->user_login, $recipients ) )
             unset( $recipients[$key] );
         $pmessage = new BP_Messages_Message;
 …
         $pmessage->thread_id = $thread_id;
         $pmessage->date_sent = time();
         if ( $is_reply ) {
             $thread = new BP_Messages_Thread($thread_id);
 …
                 $message = __('Message could not be sent, please try again.', 'buddypress');
                 $type = 'error';
                 if ( $from_ajax ) {
                     return array('status' => 0, 'message' => $message);
 …
                     bp_core_add_message( $message, $type );
                     bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
+                }
+                }
             } else {
                 $message = __('Message sent successfully!', 'buddypress');
                 $type = 'success';
                 // Send screen notifications to the recipients
                 for ( $i = 0; $i < count($pmessage->recipients); $i++ ) {
                     if ( $pmessage->recipients[$i] != $bp->loggedin_user->id ) {
                         bp_core_add_notification( $pmessage->id, $pmessage->recipients[$i], 'messages', 'new_message' );
+                        bp_core_add_notification( $pmessage->id, $pmessage->recipients[$i], 'messages', 'new_message' );
+                    }
+                }
                 // Send email notifications to the recipients
                 require_once( BP_PLUGIN_DIR . '/bp-messages/bp-messages-notifications.php' );
 …
                 do_action( 'messages_send_message', array( 'item_id' => $pmessage->id, 'recipient_ids' => $pmessage->recipients, 'thread_id' => $pmessage->thread_id, 'component_name' => $bp->messages->slug, 'component_action' => 'message_sent', 'is_private' => 1 ) );
                 if ( $from_ajax ) {
                     return array('status' => 1, 'message' => $message, 'reply' => $pmessage);
 …
             $message = __('Message could not be sent, please try again.', 'buddypress');
             $type = 'error';
             if ( $from_ajax ) {
                 return array('status' => 0, 'message' => $message);

trunk/bp-status.php

-                      r2037
+                      r2077
     $bp->status->id = 'status';
     $bp->status->slug = BP_STATUS_SLUG;
     /* Register this in the active components array */
     $bp->active_components[$bp->status->slug] = $bp->status->id;
 …
     do_action( 'bp_status_setup_globals' );
+}
 add_action( 'plugins_loaded', 'bp_status_setup_globals', 5 );
+add_action( 'plugins_loaded', 'bp_status_setup_globals', 5 );
 add_action( 'admin_menu', 'bp_status_setup_globals', 2 );
 …
 function bp_status_register_activity_actions() {
     global $bp;
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
 …
 function bp_status_record_activity( $user_id, $content, $primary_link, $component_action = 'new_status' ) {
     global $bp;
     if ( !function_exists( 'bp_activity_add' ) )
         return false;
     return bp_activity_add( array(
             'user_id' => $user_id,
             'content' => $content,
             'primary_link' => $primary_link,
+    return bp_activity_add( array(
+            'user_id' => $user_id,
+            'content' => $content,
+            'primary_link' => $primary_link,
             'component_name' => $bp->status->id,
             'component_action' => $component_action
 …
 function bp_status_register_activity_action( $key, $value ) {
     global $bp;
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
     return apply_filters( 'bp_status_register_activity_action', bp_activity_set_action( $bp->status->id, $key, $value ), $key, $value );
+}
 …
     if ( $bp->current_component != BP_STATUS_SLUG || 'add' != $bp->current_action )
         return false;
     if ( !check_admin_referer( 'bp_status_add_status', '_wpnonce_add_status' ) )
         return false;
 …
     else
         bp_core_add_message( __( 'There was a problem updating your status. Please try again.', 'buddypress' ), 'error' );
     bp_core_redirect( $bp->loggedin_user->domain );
+}
 …
 function bp_status_add_status( $user_id, $content, $recorded_time = false ) {
     global $bp;
     $content = apply_filters( 'bp_status_content_before_save', $content );
     if ( !$recorded_time )
+    if ( !$recorded_time )
         $recorded_time = time();
     if ( !$content || empty($content) )
         return false;
     bp_status_clear_existing_activity( $user_id );
     /* Store the status in usermeta for easy access. */
     update_usermeta( $user_id, 'bp_status', array( 'content' => $content, 'recorded_time' => $recorded_time ) );
 …
     bp_status_record_activity( $user_id, apply_filters( 'bp_status_activity_new', $activity_content, $content, $user_link ), apply_filters( 'bp_status_activity_new_primary_link', $user_link, $user_id ) );
     do_action( 'bp_status_add_status', $user_id, $content );
 …
 function bp_status_clear_status( $user_id = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     bp_status_clear_existing_activity( $user_id );
     return delete_usermeta( $user_id, 'bp_status' );
+}
 …
     /* Fetch existing status update if there is one. */
     $existing_status = get_usermeta( $user_id, 'bp_status' );
     if ( '' != $existing_status ) {
         if ( strtotime( '+5 minutes', $existing_status['recorded_time'] ) >= time() ) {

trunk/bp-status/bp-status-templatetags.php

-                      r2038
+                      r2077
         if ( 'clear' == $_GET['status'] && is_user_logged_in() )
             bp_status_clear_status();
         echo bp_get_the_status( $args );
+    }
 …
     function bp_get_the_status( $args = false ) {
         global $bp;
         $defaults = array(
             'user_id' => $bp->displayed_user->id,
 …
             'no_anchor' => false
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         $status = apply_filters( 'bp_status_from_usermeta', get_usermeta( $user_id, 'bp_status' ) );
+        $status = apply_filters( 'bp_status_from_usermeta', get_usermeta( $user_id, 'bp_status' ) );
         if ( empty($status) )
             return bp_get_update_status_button( 'text=' . $new_button_text );
         $time_since = sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $status['recorded_time'] ) );
         $content = apply_filters( 'the_status_content', $status['content'] );
         if ( !(int)$no_anchor && $user_id == $bp->loggedin_user->id )
             $content = '<a href="' . bp_core_get_user_domain( $user_id ) . '?status=new" id="status-new-status">' . $content . '</a>';
 …
         $content .= ' <span class="time-since">' . $time_since . '</span>';
         $content .= ' ' . bp_get_clear_status_button( 'text=' . $clear_button_text );
         return apply_filters( 'bp_get_the_status', $content );
+    }
 function bp_update_status_button( $args = false ) {
     echo bp_get_update_status_button( $args );
 …
             'text' => __( 'Update Your Status', 'buddypress' )
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         if ( $user_id != $bp->loggedin_user->id )
             return false;
         return apply_filters( 'bp_get_update_status_button', '<div class="generic-button"><a href="' . bp_core_get_user_domain( $user_id ) . '?status=new" id="status-new-status">' . $text . '</a></div>' );
+    }
 …
             'text' => __( 'Clear', 'buddypress' )
         );
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
         if ( $user_id != $bp->loggedin_user->id )
             return false;
         return apply_filters( 'bp_get_clear_status_button', '<a href="' . bp_core_get_user_domain( $user_id ) . '?status=clear" id="status-clear-status">' . $text . '</a>' );
+    }
 …
 function bp_status_form_action( $user_id = false ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->loggedin_user->id;
     echo apply_filters( 'bp_status_form_action', bp_core_get_user_domain( $user_id ) . BP_STATUS_SLUG . '/add' );
+}

trunk/bp-themes/bp-default/_inc/css/adminbar.css

-                      r2009
+                      r2077
         padding-right: 0;
+    }
 #wp-admin-bar ul li ul a {
     color: #666 !important;
 …
     -webkit-border-radius: 2px !important;
     margin-left: 2px !important;
+}
+}

trunk/bp-themes/bp-default/style.css

r2042	r2077
1		/*
	1	/*
2	2	Theme Name: BuddyPress Default
3	3	Theme URI: http://buddypress.org/extend/themes/

trunk/bp-themes/bp-sn-parent/404.php

-                      r1905
+                      r2077
     <div id="content">
         <?php do_action( 'bp_before_404' ) ?>
         <div class="page 404">
             <h2 class="pagetitle"><?php _e( 'Page Not Found', 'buddypress' ) ?></h2>
             <div id="message" class="info">
                 <p><?php _e( 'The page you were looking for was not found.', 'buddypress' ) ?>
             </div>
 …
         <?php do_action( 'bp_after_404' ) ?>
     </div>
     <?php get_sidebar() ?>

trunk/bp-themes/bp-sn-parent/activity/just-me.php

-                      r1905
+                      r2077
         <?php do_action( 'bp_before_my_activity_content' ) ?>
         <div class="left-menu">
             <!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
 …
         <div class="main-column">
             <?php bp_get_profile_header() ?>
 …
                 <?php if ( bp_has_activities( 'type=personal&per_page=25&max=500' ) ) : ?>
                     <div class="pagination">
                         <div class="pag-count" id="activity-count">
                             <?php bp_activity_pagination_count() ?>
                         </div>
                         <div class="pagination-links" id="activity-pag">
                             &nbsp; <?php bp_activity_pagination_links() ?>
                         </div>
                     </div>
                     <ul id="activity-list" class="item-list activity-list">
                     <?php while ( bp_activities() ) : bp_the_activity(); ?>
 …
                                 <?php bp_activity_avatar() ?>
                             </div>
                             <?php bp_activity_content() ?>
                             <?php do_action( 'bp_my_activity_item' ) ?>
                         </li>
                     <?php endwhile; ?>
                     </ul>
                     <?php do_action( 'bp_my_activity_content' ) ?>
 …
                 <?php endif;?>
             </div>
         </div>

trunk/bp-themes/bp-sn-parent/activity/my-friends.php

-                      r1905
+                      r2077
         <?php do_action( 'bp_before_friends_activity_content' ) ?>
         <div class="left-menu">
             <!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
 …
                     <div class="pagination">
                         <div class="pag-count" id="activity-count">
                             <?php bp_activity_pagination_count() ?>
                         </div>
                         <div class="pagination-links" id="activity-pag">
                             &nbsp; <?php bp_activity_pagination_links() ?>
                         </div>
                     </div>
                     <ul id="activity-list" class="item-list activity-list">
                     <?php while ( bp_activities() ) : bp_the_activity(); ?>
 …
                                 <?php bp_activity_avatar() ?>
                             </div>
                             <?php bp_activity_content() ?>
 …
                     <?php endwhile; ?>
                     </ul>
                     <?php do_action( 'bp_friends_activity_content' ) ?>
 …
                 <?php endif;?>
             </div>
         </div>

trunk/bp-themes/bp-sn-parent/archive.php

-                      r1905
+                      r2077
         <?php do_action( 'bp_before_archive' ) ?>
         <div class="page" id="blog-archives">
             <h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
             <?php if ( have_posts() ) : ?>
 …
                 <div class="navigation">
                     <div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
                     <div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
                 </div>
 …
                     <?php do_action( 'bp_before_blog_post' ) ?>
                     <div class="post">
                         <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
                         <small><?php the_time('F j, Y') ?></small>
 …
                 <div class="navigation">
                     <div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
                     <div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
                 </div>
 …
                 <h2 class="center"><?php _e( 'Not Found', 'buddypress' ) ?></h2>
                 <?php locate_template( array( 'searchform.php' ), true ) ?>
             <?php endif; ?>
 …
         <?php do_action( 'bp_after_archive' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/attachment.php

-                      r1905
+                      r2077
         <?php do_action( 'bp_before_attachment' ) ?>
         <div class="page" id="attachments-page">
             <h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
                 <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 …
                     <?php $attachment_link = get_the_attachment_link($post->ID, true, array(450, 800)); // This also populates the iconsize for the next line ?>
                     <?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?>
                     <div class="post" id="post-<?php the_ID(); ?>">
                         <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
                         <div class="entry">
                             <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
 …
                             <?php wp_link_pages( array( 'before' => __( '<p><strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p>', 'next_or_number' => 'number')); ?>
                         </div>
                     </div>

trunk/bp-themes/bp-sn-parent/blogs/create.php

-                      r1905
+                      r2077
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
         <h2><?php _e( 'Create a Blog', 'buddypress' ) ?></h2>
 …
         <?php if ( bp_blog_signup_enabled() ) : ?>
             <?php bp_show_blog_signup_form() ?>
         <?php else: ?>

trunk/bp-themes/bp-sn-parent/blogs/my-blogs.php

-                      r1905
+                      r2077
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
         <h2><?php bp_word_or_name( __( "My Blogs", 'buddypress' ), __( "%s's Blogs", 'buddypress' ) ) ?></h2>
 …
         <?php if ( bp_has_blogs() ) : ?>
             <ul id="blog-list" class="item-list">
                 <?php while ( bp_blogs() ) : bp_the_blog(); ?>
                     <li>
                         <h4><a href="<?php bp_blog_permalink() ?>"><?php bp_blog_title() ?></a></h4>
 …
                         <?php do_action( 'bp_my_blogs_item' ) ?>
                     </li>
                 <?php endwhile; ?>
             </ul>
             <?php do_action( 'bp_my_blogs_content' ) ?>
         <?php else: ?>

trunk/bp-themes/bp-sn-parent/blogs/recent-comments.php

-                      r1905
+                      r2077
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
         <h2><?php _e("Recent Comments", "buddypress"); ?></h2>
 …
             <ul id="comment-list" class="item-list">
                 <?php while ( bp_comments() ) : bp_the_comment(); ?>
                     <li id="comment-<?php bp_comment_id() ?>">
                         <span class="small"><?php printf( __( 'On %1$s %2$s said:', 'buddypress' ), bp_comment_date( __( 'F jS, Y', 'buddypress' ), false ), bp_comment_author( false ) ); ?></span>
 …
                         <?php do_action( 'bp_recent_comments_item' ) ?>
                     </li>
                 <?php endwhile; ?>
             </ul>
             <?php do_action( 'bp_recent_comments_content' ) ?>

trunk/bp-themes/bp-sn-parent/blogs/recent-posts.php

-                      r1905
+                      r2077
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
         <h2><?php _e("Recent Posts", "buddypress"); ?></h2>
         <?php do_action( 'bp_before_recent_posts_content' ) ?>
+        <?php do_action( 'bp_before_recent_posts_content' ) ?>
         <?php if ( bp_has_posts() ) : ?>
             <?php while ( bp_posts() ) : bp_the_post(); ?>
                 <div class="post" id="post-<?php bp_post_id(); ?>">
                     <h2><a href="<?php bp_post_permalink() ?>" rel="bookmark" title="<?php printf ( __( 'Permanent Link to %s', 'buddypress' ), bp_post_title( false ) ); ?>"><?php bp_post_title(); ?></a></h2>
                     <p class="date"><?php printf( __( '%1$s <em>in %2$s by %3$s</em>', 'buddypress' ), bp_post_date(__('F jS, Y', 'buddypress'), false ), bp_post_category( ', ', '', null, false ), bp_post_author( false ) ); ?></p>
                     <?php bp_post_content(__('Read the rest of this entry &raquo;')); ?>
                     <p class="postmetadata"><?php bp_post_tags( '<span class="tags">', ', ', '</span>' ); ?>  <span class="comments"><?php bp_post_comments( __('No Comments'), __('1 Comment'), __('% Comments') ); ?></span></p>
                     <?php do_action( 'bp_recent_posts_item' ) ?>
+                    <?php do_action( 'bp_recent_posts_item' ) ?>
                     <hr />
                 </div>
             <?php endwhile; ?>
             <?php do_action( 'bp_recent_posts_content' ) ?>
+            <?php do_action( 'bp_recent_posts_content' ) ?>
         <?php else: ?>
 …
         <?php endif;?>
         <?php do_action( 'bp_after_recent_posts_content' ) ?>
+        <?php do_action( 'bp_after_recent_posts_content' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/comments.php

-                      r1905
+                      r2077
                 <?php if ( get_option( 'page_comments' ) ) : ?>
                     <div class="comment-navigation paged-navigation">
                         <?php paginate_comments_links(); ?>
 …
                     <?php do_action( 'bp_before_blog_comment_form' ) ?>
                     <form action="<?php echo get_option( 'siteurl' ); ?>/wp-comments-post.php" method="post" id="commentform" class="standard-form">
 …
         <?php endif; ?>
     </div>

trunk/bp-themes/bp-sn-parent/directories/blogs/blogs-loop.php

-                      r1905
+                      r2077
 <?php if ( bp_has_site_blogs( 'type=active&per_page=10' ) ) : ?>
     <div class="pagination">
         <div class="pag-count" id="blog-dir-count">
             <?php bp_site_blogs_pagination_count() ?>
 …
             <?php bp_site_blogs_pagination_links() ?>
         </div>
     </div>
     <?php do_action( 'bp_before_directory_blogs_list' ) ?>
+    <?php do_action( 'bp_before_directory_blogs_list' ) ?>
     <ul id="blogs-list" class="item-list">
 …
                     <a href="<?php bp_the_site_blog_link() ?>" class="visit" title="<?php _e( 'Visit Blog', 'buddypress' ) ?>"><?php _e( 'Visit Blog', 'buddypress' ) ?></a>
                 </div>
                 <div class="meta">
                     <?php bp_the_site_blog_latest_post() ?>
                 </div>
                 <?php do_action( 'bp_directory_blogs_actions' ) ?>
             </div>
 …
     <?php endwhile; ?>
     </ul>
+    </ul>
     <?php do_action( 'bp_after_directory_blogs_list' ) ?>
+    <?php do_action( 'bp_after_directory_blogs_list' ) ?>
 <?php else: ?>

trunk/bp-themes/bp-sn-parent/directories/blogs/index.php

-                      r1905
+                      r2077
 <?php get_header() ?>
     <?php do_action( 'bp_before_directory_blogs_content' ) ?>
+    <?php do_action( 'bp_before_directory_blogs_content' ) ?>
     <div id="content">
         <div class="page" id="blogs-directory-page">
             <form action="<?php echo site_url() . '/' ?>" method="post" id="blogs-directory-form">
                 <h3><?php _e( 'Blog Directory', 'buddypress' ) ?></h3>
                 <ul id="letter-list">
                     <li><a href="#a" id="letter-a">A</a></li>
 …
                 <div id="blogs-directory-listing" class="directory-listing">
                     <h3><?php _e( 'Blog Listing', 'buddypress' ) ?></h3>
                     <div id="blog-dir-list">
                         <?php locate_template( array( 'directories/blogs/blogs-loop.php' ), true ) ?>
 …
                 <?php do_action( 'bp_directory_blogs_content' ) ?>
                 <?php wp_nonce_field( 'directory_blogs', '_wpnonce-blog-filter' ) ?>
             </form>
         </div>
     </div>
     <?php do_action( 'bp_after_directory_blogs_content' ) ?>
     <?php do_action( 'bp_before_directory_blogs_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_blogs_content' ) ?>
+    <?php do_action( 'bp_before_directory_blogs_sidebar' ) ?>
     <div id="sidebar" class="directory-sidebar">
         <?php do_action( 'bp_before_directory_blogs_search' ) ?>
+        <?php do_action( 'bp_before_directory_blogs_search' ) ?>
         <div id="blogs-directory-search" class="directory-widget">
             <h3><?php _e( 'Find Blogs', 'buddypress' ) ?></h3>
             <?php bp_directory_blogs_search_form() ?>
             <?php do_action( 'bp_directory_blogs_search' ) ?>
+            <?php do_action( 'bp_directory_blogs_search' ) ?>
         </div>
         <?php do_action( 'bp_after_directory_blogs_search' ) ?>
         <?php do_action( 'bp_before_directory_blogs_featured' ) ?>
+        <?php do_action( 'bp_after_directory_blogs_search' ) ?>
+        <?php do_action( 'bp_before_directory_blogs_featured' ) ?>
         <div id="blogs-directory-featured" class="directory-widget">
             <h3><?php _e( 'Random Blogs', 'buddypress' ) ?></h3>
             <?php if ( bp_has_site_blogs( 'type=random&max=3' ) ) : ?>
 …
                                 <div class="item-title"><a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_name() ?></a></div>
                                 <div class="item-meta"><span class="activity"><?php bp_the_site_blog_last_active() ?></span></div>
                                 <div class="field-data">
                                     <div class="field-name">
 …
                                     </div>
                                 </div>
                                 <?php do_action( 'bp_directory_blogs_featured_item' ) ?>
                             </div>
 …
                     <?php endwhile; ?>
                 </ul>
+                </ul>
                 <?php do_action( 'bp_directory_blogs_featured' ) ?>
+                <?php do_action( 'bp_directory_blogs_featured' ) ?>
             <?php else: ?>
 …
             <?php endif; ?>
         </div>
         <?php do_action( 'bp_after_directory_blogs_featured' ) ?>
+        <?php do_action( 'bp_after_directory_blogs_featured' ) ?>
     </div>
     <?php do_action( 'bp_after_directory_blogs_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_blogs_sidebar' ) ?>
 <?php get_footer() ?>

trunk/bp-themes/bp-sn-parent/directories/forums/forums-loop.php

-                      r1924
+                      r2077
 <?php if ( bp_has_forum_topics( 'type=' . bp_get_forum_topic_type() . '&per_page=25&max=250' ) ) : ?>
+<?php if ( bp_has_forum_topics( 'type=' . bp_get_forum_topic_type() . '&per_page=25&max=250' ) ) : ?>
     <div class="pagination">
         <div id="post-count" class="pag-count">
             <?php bp_forum_pagination_count() ?>
 …
             <?php bp_forum_pagination() ?>
         </div>
     </div>
     <?php do_action( 'bp_before_directory_forums_list' ) ?>
+    <?php do_action( 'bp_before_directory_forums_list' ) ?>
     <table id="global-forum-topic-list">
         <tr>
             <th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
 …
             <th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>
         </tr>
         <?php while ( bp_forum_topics() ) : bp_the_forum_topic(); ?>
         <tr class="<?php bp_the_topic_css_class() ?>">
             <td class="td-title">
 …
                 <a href="<?php bp_the_topic_permalink() ?>">
                     <?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?>
                 </a>
+                </a>
                 <div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>
             </td>
             <td class="td-group">
                 <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
+                <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
                 <div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a></div>
             </td>
 …
             </td>
             <?php do_action( 'bp_directory_forums_extra_cell' ) ?>
+            <?php do_action( 'bp_directory_forums_extra_cell' ) ?>
         </tr>
         <?php do_action( 'bp_directory_forums_extra_row' ) ?>
+        <?php do_action( 'bp_directory_forums_extra_row' ) ?>
         <?php endwhile; ?>
     </table>
     <?php do_action( 'bp_after_directory_forums_list' ) ?>
+    <?php do_action( 'bp_after_directory_forums_list' ) ?>
 <?php else: ?>

trunk/bp-themes/bp-sn-parent/directories/forums/index.php

-                      r2018
+                      r2077
 <?php get_header() ?>
     <?php do_action( 'bp_before_directory_forums_content' ) ?>
+    <?php do_action( 'bp_before_directory_forums_content' ) ?>
     <div id="content">
         <div class="page" id="forums-directory-page">
             <form action="<?php echo site_url() . '/' ?>" method="post" id="forums-directory-form">
 …
                     <div id="popular-group-forum-listing">
                         <h3><?php _e( 'Popular Group Forums', 'buddypress' ) ?></h3>
                         <?php do_action( 'bp_before_directory_popular_group_forums' ) ?>
+                        <?php do_action( 'bp_before_directory_popular_group_forums' ) ?>
                         <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
 …
                         <?php endwhile; ?>
                         <?php do_action( 'bp_after_directory_popular_group_forums' ) ?>
+                        <?php do_action( 'bp_after_directory_popular_group_forums' ) ?>
                     </div>
                 <?php endif; ?>
                 <div id="forums-directory-listing" class="directory-listing">
                     <h3><?php _e( 'Latest Forum Topics', 'buddypress' ) ?></h3>
                     <div id="forum-dir-list">
                         <?php do_action( 'bp_before_directory_forums_topic_filters' ) ?>
                         <div id="global-forum-topic-filters">
                             <ul>
 …
                                 <li<?php if ( 'popular' == bp_current_action() ) : ?> class="selected"<?php endif; ?> id="forums-popular"><a href="<?php bp_popular_forum_topics_link() ?>" title="<?php _e( 'Most Popular Topics', 'buddypress' ) ?>"><?php _e( 'Most Popular Topics', 'buddypress') ?></a></li>
                                 <li<?php if ( 'unreplied' == bp_current_action() ) : ?> class="selected"<?php endif; ?> id="forums-unreplied"><a href="<?php bp_unreplied_forum_topics_link() ?>" title="<?php _e( 'Unreplied Topics', 'buddypress' ) ?>"><?php _e( 'Unreplied Topics', 'buddypress') ?></a></li>
                                 <?php if ( is_user_logged_in() ) : ?>
                                     <li<?php if ( 'personal' == bp_current_action() ) : ?> class="selected"<?php endif; ?> id="forums-personal"><a href="<?php bp_my_forum_topics_link() ?>" title="<?php _e( 'Topics I have started or replied to', 'buddypress' ) ?>"><?php _e( 'My Topics', 'buddypress') ?></a></li>
                                 <?php endif; ?>
                                 <?php if ( 'tag' == bp_current_action() ) : ?>
                                     <li class="selected" id="forums-tag"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php _e( 'Tag', 'buddypress' ) ?>"><?php printf( __( 'Tagged: %s', 'buddypress' ), bp_get_forums_tag_name() ) ?></a></li>
                                 <?php endif; ?>
                                 <?php if ( isset( $_GET['fs'] ) ) : ?>
                                     <li class="selected" id="forums-search"><a href="<?php bp_newest_forum_topics_link() ?>" title="<?php _e( 'Search', 'buddypress' ) ?>"><?php printf( __( 'Matching: %s', 'buddypress' ), attribute_escape( $_GET['fs'] ) ) ?></a></li>
                                 <?php endif; ?>
                                 <?php do_action( 'bp_directory_forums_topic_filters' ) ?>
                             </ul>
+                            </ul>
                         </div>
                         <?php do_action( 'bp_after_directory_forums_topic_filters' ) ?>
 …
                 </div>
                 <?php do_action( 'bp_directory_forums_content' ) ?>
             </form>
         </div>
     </div>
     <?php do_action( 'bp_after_directory_forums_content' ) ?>
     <?php do_action( 'bp_before_directory_forums_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_forums_content' ) ?>
+    <?php do_action( 'bp_before_directory_forums_sidebar' ) ?>
     <div id="sidebar" class="directory-sidebar">
         <?php do_action( 'bp_before_directory_forums_search' ) ?>
+        <?php do_action( 'bp_before_directory_forums_search' ) ?>
         <div id="forums-directory-search" class="directory-widget">
             <h3><?php _e( 'Forum Topic Search', 'buddypress' ) ?></h3>
 …
             <?php do_action( 'bp_directory_forums_search' ) ?>
         </div>
         <?php do_action( 'bp_after_directory_forums_search' ) ?>
         <?php do_action( 'bp_before_directory_forums_tags' ) ?>
+        <?php do_action( 'bp_before_directory_forums_tags' ) ?>
         <div id="forums-directory-tags" class="directory-widget">
             <h3><?php _e( 'Forum Topic Tags', 'buddypress' ) ?></h3>
 …
             <?php do_action( 'bp_directory_forums_search' ) ?>
         </div>
         <?php do_action( 'bp_after_directory_forums_search' ) ?>
+        <?php do_action( 'bp_after_directory_forums_search' ) ?>
     </div>
     <?php do_action( 'bp_after_directory_forums_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_forums_sidebar' ) ?>
 <?php get_footer() ?>

trunk/bp-themes/bp-sn-parent/directories/groups/groups-loop.php

-                      r1921
+                      r2077
 <?php if ( bp_has_site_groups( 'type=active&per_page=10' ) ) : ?>
     <div class="pagination">
         <div class="pag-count" id="group-dir-count">
             <?php bp_site_groups_pagination_count() ?>
 …
             <?php bp_site_groups_pagination_links() ?>
         </div>
     </div>
     <?php do_action( 'bp_before_directory_groups_list' ) ?>
+    <?php do_action( 'bp_before_directory_groups_list' ) ?>
     <ul id="groups-list" class="item-list">
 …
                     <?php bp_the_site_group_type() ?> / <?php bp_the_site_group_member_count() ?>
                 </div>
                 <?php do_action( 'bp_directory_groups_actions' ) ?>
             </div>
 …
     <?php endwhile; ?>
     </ul>
+    </ul>
     <?php do_action( 'bp_after_directory_groups_list' ) ?>
+    <?php do_action( 'bp_after_directory_groups_list' ) ?>
 <?php else: ?>

trunk/bp-themes/bp-sn-parent/directories/groups/index.php

-                      r1921
+                      r2077
 <?php get_header() ?>
     <?php do_action( 'bp_before_directory_groups_content' ) ?>
+    <?php do_action( 'bp_before_directory_groups_content' ) ?>
     <div id="content">
         <div class="page" id="groups-directory-page">
             <form action="<?php echo site_url() . '/' ?>" method="post" id="groups-directory-form">
                 <h3><?php _e( 'Groups Directory', 'buddypress' ) ?></h3>
                 <ul id="letter-list">
                     <li><a href="#a" id="letter-a">A</a></li>
 …
                 <div id="groups-directory-listing" class="directory-listing">
                     <h3><?php _e( 'Groups Listing', 'buddypress' ) ?></h3>
                     <div id="group-dir-list">
                         <?php locate_template( array( 'directories/groups/groups-loop.php' ), true ) ?>
 …
                 </div>
                 <?php do_action( 'bp_directory_groups_content' ) ?>
 …
             </form>
         </div>
     </div>
     <?php do_action( 'bp_after_directory_groups_content' ) ?>
     <?php do_action( 'bp_before_directory_groups_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_groups_content' ) ?>
+    <?php do_action( 'bp_before_directory_groups_sidebar' ) ?>
     <div id="sidebar" class="directory-sidebar">
         <?php do_action( 'bp_before_directory_groups_search' ) ?>
+        <?php do_action( 'bp_before_directory_groups_search' ) ?>
         <div id="groups-directory-search" class="directory-widget">
             <h3><?php _e( 'Find Groups', 'buddypress' ) ?></h3>
 …
             <?php do_action( 'bp_directory_groups_search' ) ?>
         </div>
         <?php do_action( 'bp_after_directory_groups_search' ) ?>
         <?php do_action( 'bp_before_directory_groups_featured' ) ?>
+        <?php do_action( 'bp_after_directory_groups_search' ) ?>
+        <?php do_action( 'bp_before_directory_groups_featured' ) ?>
         <div id="groups-directory-featured" class="directory-widget">
             <h3><?php _e( 'Random Groups', 'buddypress' ) ?></h3>
             <?php if ( bp_has_site_groups( 'type=random&max=3' ) ) : ?>
 …
                             <div class="item">
                                 <div class="item-title"><a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_name() ?></a></div>
                                 <div class="item-meta"><span class="activity"><?php bp_the_site_group_last_active() ?></span></div>
                                 <div class="field-data">
                                     <div class="field-name">
 …
                                         <?php bp_the_site_group_member_count() ?>
                                     </div>
                                     <div class="field-name">
                                         <strong><?php _e( 'Description:', 'buddypress' ) ?></strong>
 …
                                     </div>
                                 </div>
                                 <?php do_action( 'bp_directory_groups_featured_item' ) ?>
                             </div>
 …
                     <?php endwhile; ?>
                 </ul>
+                </ul>
                 <?php do_action( 'bp_directory_groups_featured' ) ?>
+                <?php do_action( 'bp_directory_groups_featured' ) ?>
             <?php else: ?>
 …
             <?php endif; ?>
         </div>
         <?php do_action( 'bp_after_directory_groups_featured' ) ?>
+        <?php do_action( 'bp_after_directory_groups_featured' ) ?>
     </div>
     <?php do_action( 'bp_after_directory_groups_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_groups_sidebar' ) ?>
 <?php get_footer() ?>

trunk/bp-themes/bp-sn-parent/directories/members/index.php

-                      r1905
+                      r2077
 <?php get_header() ?>
     <?php do_action( 'bp_before_directory_members_content' ) ?>
+    <?php do_action( 'bp_before_directory_members_content' ) ?>
     <div id="content">
         <div class="page" id="members-directory-page">
             <form action="<?php echo site_url() . '/' ?>" method="post" id="members-directory-form">
                 <h3><?php _e( 'Members Directory', 'buddypress' ) ?></h3>
                 <ul id="letter-list">
                     <li><a href="#a" id="letter-a">A</a></li>
 …
                 <div id="members-directory-listing" class="directory-widget">
                     <h3><?php _e( 'Member Listing', 'buddypress' ) ?></h3>
                     <div id="member-dir-list">
                         <?php locate_template( array( 'directories/members/members-loop.php' ), true ) ?>
 …
                 <?php do_action( 'bp_directory_members_content' ) ?>
                 <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?>
+                <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?>
             </form>
         </div>
     </div>
     <?php do_action( 'bp_after_directory_members_content' ) ?>
     <?php do_action( 'bp_before_directory_members_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_members_content' ) ?>
+    <?php do_action( 'bp_before_directory_members_sidebar' ) ?>
     <div id="sidebar" class="directory-sidebar">
         <?php do_action( 'bp_before_directory_members_search' ) ?>
 …
         </div>
         <?php do_action( 'bp_after_directory_members_search' ) ?>
         <?php do_action( 'bp_before_directory_members_featured' ) ?>
+        <?php do_action( 'bp_after_directory_members_search' ) ?>
+        <?php do_action( 'bp_before_directory_members_featured' ) ?>
         <div id="members-directory-featured" class="directory-widget">
             <h3><?php _e( 'Random Members', 'buddypress' ) ?></h3>
             <?php if ( bp_has_site_members( 'type=random&max=3' ) ) : ?>
 …
                             <div class="item-title"><a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_name() ?></a></div>
                             <div class="item-meta"><span class="activity"><?php bp_the_site_member_last_active() ?></span></div>
                             <div class="field-data">
                                 <div class="field-name"><?php bp_the_site_member_total_friend_count() ?></div>
                                 <div class="field-name xprofile-data"><?php bp_the_site_member_random_profile_data() ?></div>
                             </div>
                             <?php do_action( 'bp_directory_members_featured_item' ) ?>
                         </div>
 …
                 <?php endwhile; ?>
                 </ul>
+                </ul>
                 <?php do_action( 'bp_directory_members_featured' ) ?>
+                <?php do_action( 'bp_directory_members_featured' ) ?>
             <?php else: ?>
 …
             <?php endif; ?>
         </div>
         <?php do_action( 'bp_after_directory_members_featured' ) ?>
+        <?php do_action( 'bp_after_directory_members_featured' ) ?>
     </div>
     <?php do_action( 'bp_after_directory_members_sidebar' ) ?>
+    <?php do_action( 'bp_after_directory_members_sidebar' ) ?>
 <?php get_footer() ?>

trunk/bp-themes/bp-sn-parent/directories/members/members-loop.php

-                      r1905
+                      r2077
 <?php if ( bp_has_site_members( 'type=active&per_page=10' ) ) : ?>
     <div class="pagination">
         <div class="pag-count" id="member-dir-count">
             <?php bp_site_members_pagination_count() ?>
 …
     </div>
     <?php do_action( 'bp_before_directory_members_list' ) ?>
+    <?php do_action( 'bp_before_directory_members_list' ) ?>
     <ul id="members-list" class="item-list">
 …
     <?php endwhile; ?>
     </ul>
+    </ul>
     <?php do_action( 'bp_after_directory_members_list' ) ?>
+    <?php do_action( 'bp_after_directory_members_list' ) ?>
 <?php else: ?>

trunk/bp-themes/bp-sn-parent/footer.php

-                      r1905
+                      r2077
         </div> <!-- #container -->
         <?php do_action( 'bp_after_container' ) ?>
         <div class="clear"></div>
         <?php do_action( 'bp_before_footer' ) ?>
+        <?php do_action( 'bp_before_footer' ) ?>
         <div id="footer">
             <p><?php printf( __( '%s is proudly powered by <a href="http://mu.wordpress.org">WordPress MU</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo('name') ); ?></p>
             <?php do_action( 'bp_footer' ) ?>
         </div>
 …
         <?php wp_footer(); ?>
     </body>

trunk/bp-themes/bp-sn-parent/friends/friends-loop.php

-                      r1905
+                      r2077
 <?php do_action( 'bp_before_my_friends_loop' ) ?>
+<?php do_action( 'bp_before_my_friends_loop' ) ?>
 <div id="friends-loop">
     <?php if ( bp_has_friendships() ) : ?>
         <div class="pagination">
 …
                 <?php bp_friend_pagination_count() ?>
             </div>
             <div class="pagination-links" id="pag">
                 <?php bp_friend_pagination() ?>
             </div>
         </div>
         <?php do_action( 'bp_before_my_friends_list' ) ?>
         <ul id="friend-list" class="item-list">
             <?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
                 <li>
                     <?php bp_friend_avatar_thumb() ?>
 …
                     <span class="activity"><?php bp_friend_last_active() ?></span>
                     <?php do_action( 'bp_my_friends_list_item' ) ?>
+                    <?php do_action( 'bp_my_friends_list_item' ) ?>
                     <div class="action">
                         <?php bp_add_friend_button() ?>
                         <?php do_action( 'bp_my_friends_list_item_action' ) ?>
                     </div>
                 </li>
             <?php endwhile; ?>
         </ul>
         <?php do_action( 'bp_after_my_friends_list' ) ?>
     <?php else: ?>
         <?php if ( bp_friends_is_filtered() ) : ?>
             <div id="message" class="info">
                 <p><?php _e( "No friends matched your search filter terms", 'buddypress' ) ?></p>
             </div>
+            </div>
         <?php else : ?>
             <div id="message" class="info">
                 <p><?php bp_word_or_name( __( "Your friends list is currently empty", 'buddypress' ), __( "%s's friends list is currently empty", 'buddypress' ) ) ?></p>
             </div>
         <?php endif; ?>
         <?php if ( bp_is_home() && !bp_friends_is_filtered() ) : ?>
             <?php do_action( 'bp_before_random_members_list' ) ?>
             <h3><?php _e( 'Why not make friends with some of these members?', 'buddypress' ) ?></h3>
             <?php bp_friends_random_members() ?>
             <?php do_action( 'bp_after_random_members_list' ) ?>
         <?php endif; ?>
     <?php endif;?>
 </div>
 <?php do_action( 'bp_after_my_friends_loop' ) ?>
+<?php do_action( 'bp_after_my_friends_loop' ) ?>

trunk/bp-themes/bp-sn-parent/friends/index.php

-                      r1905
+                      r2077
         <h2><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> &raquo; <?php bp_friends_filter_title() ?></h2>
         <?php do_action( 'bp_before_my_friends_content' ) ?>
+        <?php do_action( 'bp_before_my_friends_content' ) ?>
         <div class="left-menu">
             <?php do_action( 'bp_before_my_friends_search' ) ?>
             <?php bp_friend_search_form() ?>
             <?php do_action( 'bp_after_my_friends_search' ) ?>
         </div>
 …
         <div class="main-column">
             <?php do_action( 'template_notices' ) // (error/success feedback) ?>
             <?php locate_template( array( 'friends/friends-loop.php' ), true ) ?>
         </div>
         <?php do_action( 'bp_after_my_friends_content' ) ?>
+        <?php do_action( 'bp_after_my_friends_content' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/friends/requests.php

-                      r1905
+                      r2077
     <div id="content">
         <div class="pagination">
             <div class="pagination-links" id="pag">
                 <?php bp_friend_pagination() ?>
             </div>
         </div>
         <h2><?php _e( 'Friendship Requests', 'buddypress' ); ?></h2>
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
         <?php do_action( 'bp_before_friend_requests_content' ) ?>
+        <?php do_action( 'bp_before_friend_requests_content' ) ?>
         <?php if ( bp_has_friendships() ) : ?>
             <ul id="friend-list" class="item-list">
                 <?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
                     <li>
                         <?php bp_friend_avatar_thumb() ?>
                         <h4><?php bp_friend_link() ?></h4>
                         <span class="activity"><?php bp_friend_time_since_requested() ?></span>
                         <?php do_action( 'bp_friend_requests_item' ) ?>
+                        <?php do_action( 'bp_friend_requests_item' ) ?>
                         <div class="action">
                             <div class="generic-button accept">
                                 <a href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ); ?></a>
                             </div>
                              &nbsp;
+                             &nbsp;
                             <div class="generic-button reject">
                                 <a href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
                             </div>
                             <?php do_action( 'bp_friend_requests_item_action' ) ?>
+                            <?php do_action( 'bp_friend_requests_item_action' ) ?>
                         </div>
                     </li>
                 <?php endwhile; ?>
             </ul>
             <?php do_action( 'bp_friend_requests_content' ) ?>
+            <?php do_action( 'bp_friend_requests_content' ) ?>
         <?php else: ?>
 …
         <?php endif;?>
         <?php do_action( 'bp_after_friend_requests_content' ) ?>
+        <?php do_action( 'bp_after_friend_requests_content' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/functions.php

-                      r2013
+                      r2077
 /* Register the widget columns */
 register_sidebars( 1,
     array(
+register_sidebars( 1,
+    array(
         'name' => 'first-section',
         'before_widget' => '<div id="%1$s" class="widget %2$s">',
 …
         'before_title' => '<h2 class="widgettitle">',
         'after_title' => '</h2>'
+    )
+    )
 );
 register_sidebars( 1,
     array(
+    array(
         'name' => 'second-section',
         'before_widget' => '<div id="%1$s" class="widget %2$s">',
 …
         'before_title' => '<h2 class="widgettitle">',
         'after_title' => '</h2>'
+    )
+    )
 );
 register_sidebars( 1,
     array(
+    array(
         'name' => 'third-section',
         'before_widget' => '<div id="%1$s" class="widget %2$s">',
 …
         'before_title' => '<h2 class="widgettitle">',
         'after_title' => '</h2>'
+    )
+    )
 );
 register_sidebars( 1,
     array(
+    array(
         'name' => 'blog-sidebar',
         'before_widget' => '<div id="%1$s" class="widget %2$s">',
 …
         'before_title' => '<h2 class="widgettitle">',
         'after_title' => '</h2>'
+    )
+    )
 );
 …
 function bp_dtheme_show_home_blog() {
     global $bp, $query_string, $paged;
     if ( $bp->current_component == BP_HOME_BLOG_SLUG && ( !$bp->current_action || 'page' == $bp->current_action ) ) {
+    if ( $bp->current_component == BP_HOME_BLOG_SLUG && ( !$bp->current_action || 'page' == $bp->current_action ) ) {
         unset( $query_string );
         if ( ( 'page' == $bp->current_action && $bp->action_variables[0] ) && false === strpos( $query_string, 'paged' ) ) {
             $query_string .= '&paged=' . $bp->action_variables[0];
 …
         query_posts($query_string);
         bp_core_load_template( 'index', true );
+    }

trunk/bp-themes/bp-sn-parent/groups/group-loop.php

-                      r1991
+                      r2077
 <div id="group-loop">
     <?php if ( bp_has_groups() ) : ?>
         <div class="pagination">
             <div class="pag-count">
                 <?php bp_group_pagination_count() ?>
             </div>
             <div class="pagination-links" id="<?php bp_group_pag_id() ?>">
                 <?php bp_group_pagination() ?>
             </div>
         </div>
         <?php do_action( 'bp_before_my_groups_list' ) ?>
         <ul id="group-list" class="item-list">
             <?php while ( bp_groups() ) : bp_the_group(); ?>
                 <li>
                     <?php bp_group_avatar_thumb() ?>
                     <h4><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a><span class="small"> - <?php printf( __( '%s members', 'buddypress' ), bp_group_total_members( false ) ) ?></span></h4>
                     <?php if ( bp_group_has_requested_membership() ) : ?>
                         <p class="request-pending"><?php _e( 'Membership Pending Approval', 'buddypress' ); ?></p>
                     <?php endif; ?>
                     <div class="desc">
                         <?php bp_group_description_excerpt() ?>
                     </div>
                     <?php do_action( 'bp_before_my_groups_list_item' ) ?>
                 </li>
             <?php endwhile; ?>
         </ul>
         <?php do_action( 'bp_after_my_groups_list' ) ?>
     <?php else: ?>
 …
             <?php if ( bp_is_home() ) : ?>
                 <?php do_action( 'bp_before_random_groups_list' ) ?>
                 <h3><?php _e( 'Why not join a few of these groups?', 'buddypress') ?></h3>
                 <?php bp_groups_random_selection() ?>
                 <?php do_action( 'bp_after_random_groups_list' ) ?>
             <?php endif; ?>
 …
     <?php endif;?>
 </div>

trunk/bp-themes/bp-sn-parent/groups/index.php

-                      r1905
+                      r2077
     <div id="content">
         <h2><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> &raquo; <?php bp_groups_filter_title() ?></h2>
         <?php do_action( 'bp_before_my_groups_content' ) ?>
         <div class="left-menu">
             <?php bp_group_search_form() ?>
         </div>
         <div class="main-column">
             <?php do_action( 'template_notices' ) // (error/success feedback) ?>
             <?php locate_template( array( 'groups/group-loop.php' ), true ) ?>
         </div>

trunk/bp-themes/bp-sn-parent/groups/invites.php

-                      r1905
+                      r2077
         <?php if ( bp_has_groups() ) : ?>
             <ul id="group-list" class="invites item-list">
                 <?php while ( bp_groups() ) : bp_the_group(); ?>
                     <li>
                         <?php bp_group_avatar_thumb() ?>
 …
                             <?php bp_group_description_excerpt() ?>
                         </p>
                         <?php do_action( 'bp_group_invites_item' ) ?>
                         <div class="action">
                             <div class="generic-button accept">
                                 <a href="<?php bp_group_accept_invite_link() ?>"><?php _e( 'Accept', 'buddypress' ) ?></a>
+                                <a href="<?php bp_group_accept_invite_link() ?>"><?php _e( 'Accept', 'buddypress' ) ?></a>
                             </div>
                              &nbsp;
+                             &nbsp;
                             <div class="generic-button reject">
                                 <a href="<?php bp_group_reject_invite_link() ?>"><?php _e( 'Reject', 'buddypress' ) ?></a>
+                                <a href="<?php bp_group_reject_invite_link() ?>"><?php _e( 'Reject', 'buddypress' ) ?></a>
                             </div>
                             <?php do_action( 'bp_group_invites_item_action' ) ?>
                         </div>
                         <hr />
 …
                 <?php endwhile; ?>
             </ul>
         <?php else: ?>

trunk/bp-themes/bp-sn-parent/groups/single/home.php

-                      r2014
+                      r2077
     </div>
     <div id="content">
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
 …
             <?php do_action( 'bp_before_group_content' ) ?>
             <div class="left-menu">
                 <?php locate_template( array( 'groups/single/menu.php' ), true ) ?>
 …
                     <?php do_action( 'bp_before_group_name' ) ?>
                     <div id="group-name">
                         <h1><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></h1>
                         <p class="status"><?php bp_group_type() ?></p>
                     </div>
                     <?php do_action( 'bp_after_group_name' ) ?>
                     <?php if ( !bp_group_is_visible() ) : ?>
                         <?php do_action( 'bp_before_group_status_message' ) ?>
                         <div id="message" class="info">
                             <p><?php bp_group_status_message() ?></p>
                         </div>
                         <?php do_action( 'bp_after_group_status_message' ) ?>
                     <?php endif; ?>
+                    <?php endif; ?>
                     <?php do_action( 'bp_before_group_description' ) ?>
                     <div class="bp-widget">
                         <h4><?php _e( 'Description', 'buddypress' ); ?></h4>
                         <p><?php bp_group_description() ?></p>
                     </div>
                     <?php do_action( 'bp_after_group_description' ) ?>
                     <?php if ( bp_group_is_visible() && bp_group_has_news() ) : ?>
                         <?php do_action( 'bp_before_group_news' ) ?>
                         <div class="bp-widget">
                             <h4><?php _e( 'News', 'buddypress' ); ?></h4>
                             <p><?php bp_group_news() ?></p>
                         </div>
                         <?php do_action( 'bp_after_group_news' ) ?>
                     <?php endif; ?>
+                    <?php endif; ?>
                     <?php if ( function_exists( 'bp_has_activities' ) && bp_group_is_visible() ) : ?>
                         <?php if ( bp_has_activities( 'object=groups&primary_id=' . bp_get_group_id() . '&max=150&per_page=5' ) ) : ?>
 …
                             <div class="bp-widget">
                                 <h4><?php _e( 'Group Activity', 'buddypress' ); ?></h4>
                                 <div class="pagination">
                                     <div class="pag-count" id="activity-count">
                                         <?php bp_activity_pagination_count() ?>
                                     </div>
                                     <div class="pagination-links" id="activity-pag">
                                         &nbsp; <?php bp_activity_pagination_links() ?>
 …
                                             <?php bp_activity_avatar() ?>
                                         </div>
                                         <?php bp_activity_content() ?>
                                     </li>
 …
                             </div>
                             <?php do_action( 'bp_after_group_activity' ) ?>
                         <?php endif; ?>
                     <?php endif; ?>
+                        <?php endif; ?>
+                    <?php endif; ?>
                     <?php if ( bp_group_is_visible() && bp_group_is_forum_enabled() && function_exists( 'bp_forums_setup') ) : ?>
                         <?php do_action( 'bp_before_group_active_topics' ) ?>
                         <div class="bp-widget">
                             <h4><?php _e( 'Recently Active Topics', 'buddypress' ); ?> <span><a href="<?php bp_group_forum_permalink() ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
                             <?php if ( bp_has_topics( 'no_stickies=true&max=5&per_page=5' ) ) : ?>
                                 <ul id="forum-topic-list" class="item-list">
                                     <?php while ( bp_topics() ) : bp_the_topic(); ?>
                                         <li>
                                             <a class="topic-avatar" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_last_poster_avatar( 'width=30&height=30') ?></a>
                                             <a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a>
+                                            <a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a>
                                             <span class="small topic-meta">(<?php bp_the_topic_total_post_count() ?> &rarr; <?php bp_the_topic_time_since_last_post() ?> ago)</span>
                                             <span class="small latest topic-excerpt"><?php bp_the_topic_latest_post_excerpt() ?></span>
                                             <?php do_action( 'bp_group_active_topics_item' ) ?>
                                         </li>
                                     <?php endwhile; ?>
                                 </ul>
                             <?php else: ?>
 …
                             <?php endif;?>
                         </div>
+                        </div>
                         <?php do_action( 'bp_after_group_active_topics' ) ?>
                     <?php endif; ?>
+                    <?php endif; ?>
                     <?php if ( bp_group_is_visible() ) : ?>
                         <?php do_action( 'bp_before_group_member_widget' ) ?>
                         <div class="bp-widget">
                             <h4><?php printf( __( 'Members (%d)', 'buddypress' ), bp_get_group_total_members() ); ?> <span><a href="<?php bp_group_all_members_permalink() ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
                             <?php if ( bp_group_has_members( 'max=5&exclude_admins_mods=0' ) ) : ?>
                                 <ul class="horiz-gallery">
                                     <?php while ( bp_group_members() ) : bp_group_the_member(); ?>
                                         <li>
                                             <a href="<?php bp_group_member_url() ?>"><?php bp_group_member_avatar_thumb() ?></a>
 …
                                     <?php endwhile; ?>
                                 </ul>
                             <?php endif; ?>
                         </div>
+                        </div>
                         <?php do_action( 'bp_after_group_member_widget' ) ?>
                     <?php endif; ?>
+                    <?php endif; ?>
                     <?php do_action( 'groups_custom_group_boxes' ) ?>
                     <?php if ( bp_group_is_visible() && bp_group_is_wire_enabled() ) : ?>
                         <?php if ( function_exists('bp_wire_get_post_list') ) : ?>
                             <?php do_action( 'bp_before_group_wire_widget' ) ?>
                             <?php bp_wire_get_post_list( bp_get_group_id(), __( 'Group Wire', 'buddypress' ), sprintf( __( 'There are no wire posts for %s', 'buddypress' ), bp_get_group_name() ), bp_group_is_member(), true ) ?>
                             <?php do_action( 'bp_after_group_wire_widget' ) ?>
                         <?php endif; ?>
                     <?php endif; ?>
+                    <?php endif; ?>
                 </div>
             </div>
 …
         <?php endwhile; else: ?>
             <div id="message" class="error">
                 <p><?php _e("Sorry, the group does not exist.", "buddypress"); ?></p>
             </div>
         <?php endif;?>

trunk/bp-themes/bp-sn-parent/groups/single/leave-confirm.php

-                      r1905
+                      r2077
     <div class="content-header">
     </div>
     <div id="content">
+    <div id="content">
         <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
             <?php do_action( 'bp_before_group_leave_confirm_content' ) ?>
             <div class="left-menu">
                 <?php locate_template( array( 'groups/single/menu.php' ), true ) ?>
 …
                         <h4><?php _e( 'Confirm Leave Group', 'buddypress' ); ?></h4>
                         <h3><?php _e( 'Are you sure you want to leave this group?', 'buddypress' ); ?></h3>
                         <p>
                             <a href="<?php bp_group_leave_confirm_link() ?>"><?php _e( "Yes, I'd like to leave this group.", 'buddypress' ) ?></a> |
+                            <a href="<?php bp_group_leave_confirm_link() ?>"><?php _e( "Yes, I'd like to leave this group.", 'buddypress' ) ?></a> |
                             <a href="<?php bp_group_leave_reject_link() ?>"><?php _e( "No, I'll stay!", 'buddypress' ) ?></a>
                         </p>
                         <?php do_action( 'bp_group_leave_confirm_content' ) ?>
                     </div>
                 </div>
             </div>
             <?php do_action( 'bp_after_group_leave_confirm_content' ) ?>
         <?php endwhile; endif; ?>
     </div>

trunk/bp-themes/bp-sn-parent/groups/single/members.php

-                      r1905
+                      r2077
     <div class="content-header">
     </div>
     <div id="content">
+    <div id="content">
         <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
             <?php do_action( 'bp_before_group_members_content' ) ?>
             <div class="left-menu">
                 <?php locate_template( array( 'groups/single/menu.php' ), true ) ?>
 …
                     <?php do_action( 'bp_before_group_name' ) ?>
                     <div id="group-name">
                         <h1><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a></h1>
 …
                     <?php do_action( 'bp_after_group_name' ) ?>
                     <?php do_action( 'bp_before_group_administrators_list' ) ?>
                     <div class="bp-widget">
                         <h4><?php _e( 'Administrators', 'buddypress' ); ?></h4>
 …
                     <?php do_action( 'bp_after_group_administrators_list' ) ?>
                     <?php if ( bp_group_has_moderators() ) : ?>
 …
                     <div class="bp-widget">
                         <h4><?php _e( 'Group Members', 'buddypress' ); ?></h4>
                         <form action="<?php bp_group_form_action('members') ?>" method="post" id="group-members-form">
                             <?php if ( bp_group_has_members() ) : ?>
                                 <?php if ( bp_group_member_needs_pagination() ) : ?>
                                     <div class="pagination">
 …
                                     </div>
                                 <?php endif; ?>
 …
                                 <ul id="member-list" class="item-list">
                                     <?php while ( bp_group_members() ) : bp_group_the_member(); ?>
                                         <li>
                                             <?php bp_group_member_avatar_thumb() ?>
                                             <h5><?php bp_group_member_link() ?></h5>
                                             <span class="activity"><?php bp_group_member_joined_since() ?></span>
                                             <?php do_action( 'bp_group_members_list_item' ) ?>
                                             <?php if ( function_exists( 'friends_install' ) ) : ?>
                                                 <div class="action">
                                                     <?php bp_add_friend_button( bp_get_group_member_id() ) ?>
                                                     <?php do_action( 'bp_group_members_list_item_action' ) ?>
                                                 </div>
                                             <?php endif; ?>
                                         </li>
                                     <?php endwhile; ?>
                                 </ul>
                                 <?php do_action( 'bp_after_group_members_list' ) ?>
                             <?php else: ?>
 …
                             <?php endif;?>
                         <input type="hidden" name="group_id" id="group_id" value="<?php bp_group_id() ?>" />
                         </form>
                     </div>
                 </div>
                 <?php do_action( 'bp_after_group_members_content' ) ?>
             </div>
         <?php endwhile; endif; ?>
     </div>

trunk/bp-themes/bp-sn-parent/groups/single/request-membership.php

-                      r1905
+                      r2077
     <div class="content-header">
     </div>
     <div id="content">
+    <div id="content">
         <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
 …
             <div class="bp-widget">
                 <h4><?php _e( 'Request Membership', 'buddypress' ); ?></h4>
                 <?php do_action( 'template_notices' ) // (error/success feedback) ?>
 …
                         <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php _e( 'Send Request', 'buddypress' ) ?> &raquo;" />
                         <?php wp_nonce_field( 'groups_request_membership' ) ?>
                     </form>
                 <?php endif; ?>
             </div>
         </div>
         <?php do_action( 'bp_after_group_request_membership_content' ) ?>
         <?php endwhile; endif; ?>
     </div>

trunk/bp-themes/bp-sn-parent/groups/single/send-invite.php

-                      r1905
+                      r2077
     <div class="content-header">
     </div>
     <div id="content">
         <div class="pagination">
 …
         <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
             <h2><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a> &raquo; <?php _e( 'Send Invites', 'buddypress' ); ?></h2>
             <?php do_action( 'bp_before_group_send_invites_content' ) ?>
             <?php if ( bp_has_friends_to_invite() ) : ?>
                 <form action="<?php bp_group_send_invite_form_action() ?>" method="post" id="send-invite-form">
                     <div class="left-menu">
                         <h4><?php _e( 'Select Friends', 'buddypress' ) ?> <span class="ajax-loader"></span></h4>
                         <div id="invite-list">
                             <ul>
                                 <?php bp_new_group_invite_friend_list() ?>
                             </ul>
                             <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ) ?>
                         </div>
                     </div>
                     <div class="main-column">
                         <div id="message" class="info">
                             <p><?php _e('Select people to invite from your friends list.', 'buddypress'); ?></p>
                         </div>
                         <?php do_action( 'bp_before_group_send_invites_list' ) ?>
 …
                         <ul id="friend-list" class="item-list">
                         <?php if ( bp_group_has_invites() ) : ?>
                             <?php while ( bp_group_invites() ) : bp_group_the_invite(); ?>
                                 <li id="<?php bp_group_invite_item_id() ?>">
                                     <?php bp_group_invite_user_avatar() ?>
                                     <h4><?php bp_group_invite_user_link() ?></h4>
                                     <span class="activity"><?php bp_group_invite_user_last_active() ?></span>
                                     <?php do_action( 'bp_group_send_invites_item' ) ?>
                                     <div class="action">
                                         <a class="remove" href="<?php bp_group_invite_user_remove_invite_url() ?>" id="<?php bp_group_invite_item_id() ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a>
+                                        <a class="remove" href="<?php bp_group_invite_user_remove_invite_url() ?>" id="<?php bp_group_invite_item_id() ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a>
                                         <?php do_action( 'bp_group_send_invites_item_action' ) ?>
                                     </div>
 …
                         <?php endif; ?>
                         </ul>
                         <?php do_action( 'bp_after_group_send_invites_list' ) ?>
                     </div>
                     <div class="clear"></div>
                     <p class="clear"><input type="submit" name="submit" id="submit" value="<?php _e( 'Send Invites', 'buddypress' ) ?>" /></p>
                     <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites') ?>
                     <!-- Don't leave out this hidden field -->
                     <input type="hidden" name="group_id" id="group_id" value="<?php bp_group_id() ?>" />
                 </form>
             <?php else : ?>
                 <div id="message" class="info">
                     <p><?php _e( 'You either need to build up your friends list, or your friends have already been invited or are current members.', 'buddypress' ); ?></p>
                 </div>
             <?php endif; ?>
             <?php do_action( 'bp_before_group_send_invites_content' ) ?>
         <?php endwhile; endif; ?>
     </div>

trunk/bp-themes/bp-sn-parent/groups/single/wire.php

-                      r1905
+                      r2077
     <div class="content-header">
     </div>
     <div id="content">
+    <div id="content">
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
         <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
             <?php do_action( 'bp_before_group_wire_content' ) ?>
             <div class="left-menu">
                 <?php locate_template( array( 'groups/single/menu.php' ), true ) ?>
 …
             <div class="main-column">
                 <div class="inner-tube">
                     <div id="group-name">
                         <h1><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a></h1>
 …
                     <div class="bp-widget">
                         <?php if ( function_exists('bp_wire_get_post_list') ) : ?>
                             <?php bp_wire_get_post_list( bp_group_id( false, false), __( 'Group Wire', 'buddypress' ), sprintf( __( 'There are no wire posts for %s', 'buddypress' ), bp_group_name(false) ), bp_group_is_member(), true ) ?>
                         <?php endif; ?>
                     </div>
                 </div>
             </div>
         <?php endwhile; endif; ?>

trunk/bp-themes/bp-sn-parent/header.php

-                      r2016
+                      r2077
     <body <?php body_class() ?>>
         <?php do_action( 'bp_before_search_login_bar' ) ?>
+        <?php do_action( 'bp_before_search_login_bar' ) ?>
         <div id="search-login-bar">
             <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
                 <input type="text" id="search-terms" name="search-terms" value="" />
+                <input type="text" id="search-terms" name="search-terms" value="" />
                 <?php echo bp_search_form_type_select() ?>
                 <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
                 <?php wp_nonce_field( 'bp_search_form' ) ?>
             </form>
             <?php if ( !is_user_logged_in() ) : ?>
                 <form name="login-form" id="login-form" action="<?php echo site_url( 'wp-login.php' ) ?>" method="post">
                     <input type="text" name="log" id="user_login" value="<?php _e( 'Username', 'buddypress' ) ?>" onfocus="if (this.value == '<?php _e( 'Username', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Username', 'buddypress' ) ?>';}" />
                     <input type="password" name="pwd" id="user_pass" class="input" value="" />
                     <input type="checkbox" name="rememberme" id="rememberme" value="forever" title="<?php _e( 'Remember Me', 'buddypress' ) ?>" />
                     <input type="submit" name="wp-submit" id="wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>"/>
                     <?php if ( 'none' != bp_get_signup_allowed() && 'blog' != bp_get_signup_allowed() ) : ?>
+                    <input type="submit" name="wp-submit" id="wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>"/>
+                    <?php if ( 'none' != bp_get_signup_allowed() && 'blog' != bp_get_signup_allowed() ) : ?>
                         <input type="button" name="signup-submit" id="signup-submit" value="<?php _e( 'Sign Up', 'buddypress' ) ?>" onclick="location.href='<?php echo bp_signup_page() ?>'" />
                     <?php endif; ?>
                     <input type="hidden" name="redirect_to" value="<?php echo bp_root_domain() ?>" />
                     <input type="hidden" name="testcookie" value="1" />
                     <?php do_action( 'bp_login_bar_logged_out' ) ?>
                 </form>
             <?php else : ?>
                 <div id="logout-link">
                     <?php bp_loggedin_user_avatar( 'width=20&height=20' ) ?> &nbsp; <?php bp_loggedinuser_link() ?> / <?php bp_log_out_link() ?>
                     <?php do_action( 'bp_login_bar_logged_in' ) ?>
                 </div>
             <?php endif; ?>
             <?php do_action( 'bp_search_login_bar' ) ?>
         </div>
         <?php do_action( 'bp_after_search_login_bar' ) ?>
         <?php do_action( 'bp_before_header' ) ?>
+        <?php do_action( 'bp_after_search_login_bar' ) ?>
+        <?php do_action( 'bp_before_header' ) ?>
         <div id="header">
+        <div id="header">
             <h1 id="logo"><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
             <ul id="nav">
                 <li<?php if ( bp_is_page( 'home' ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
 …
                     <li<?php if ( bp_is_page( BP_FORUMS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_FORUMS_SLUG ?>" title="<?php _e( 'Forums', 'buddypress' ) ?>"><?php _e( 'Forums', 'buddypress' ) ?></a></li>
                 <?php endif; ?>
                 <?php if ( function_exists( 'bp_blogs_install' ) ) : ?>
                     <li<?php if ( bp_is_page( BP_BLOGS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_BLOGS_SLUG ?>" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a></li>
 …
             <?php do_action( 'bp_header' ) ?>
         </div>
         <?php do_action( 'bp_after_header' ) ?>
         <?php do_action( 'bp_before_container' ) ?>
         <div id="container">
             <?php if ( !bp_is_blog_page() && !bp_is_directory() && !bp_is_register_page() && !bp_is_activation_page() ) : ?>
                 <?php locate_template( array( 'userbar.php' ), true ) /* Load the user navigation */ ?>
                 <?php locate_template( array( 'optionsbar.php' ), true ) /* Load the currently displayed object navigation */ ?>
             <?php endif; ?>

trunk/bp-themes/bp-sn-parent/home.php

-                      r1932
+                      r2077
             <?php if ( !function_exists('dynamic_sidebar')
                     || !dynamic_sidebar('third-section') ) : ?>
             <div class="widget-error">
                 <?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=first-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
             </div>
             <?php endif; ?>
         </div>
         <div id="second-section" class="widget-section">
             <?php if ( !function_exists('dynamic_sidebar')
                     || !dynamic_sidebar('second-section') ) : ?>
             <div class="widget-error">
                 <?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=second-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
             </div>
             <?php endif; ?>
         </div>
 …
             <div class="widget-error">
                 <?php _e( 'Please log in and add widgets to this section.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=third-section"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
             </div>
+            </div>
             <?php endif; ?>
         </div>

trunk/bp-themes/bp-sn-parent/index.php

-                      r1905
+                      r2077
         <div class="page" id="blog-latest">
             <h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
             <?php if ( have_posts() ) : ?>
                 <?php while (have_posts()) : the_post(); ?>
                     <?php do_action( 'bp_before_blog_post' ) ?>
                     <div class="post" id="post-<?php the_ID(); ?>">
                         <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
                         <p class="date"><?php the_time('F j, Y') ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink($post->post_author) ) ?></em></p>
 …
                 <div class="navigation">
                     <div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
                     <div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
                 </div>

trunk/bp-themes/bp-sn-parent/links.php

-                      r1905
+                      r2077
         <div class="page" id="blog-latest">
             <h2 class="pagetitle"><?php _e( 'Links', 'buddypress' ) ?></h2>
 …
                 <?php get_links_list(); ?>
             </ul>
         </div>

trunk/bp-themes/bp-sn-parent/messages/compose.php

-                      r1998
+                      r2077
     <div id="content">
         <h2><?php _e( 'Compose Message', 'buddypress' ); ?></h2>
         <?php do_action( 'template_notices' ) ?>
         <form action="<?php bp_messages_form_action('compose') ?>" method="post" id="send_message_form" class="standard-form">
             <?php do_action( 'bp_before_messages_compose_content' ) ?>
             <label for="send-to-input"><?php _e("Send To", 'buddypress') ?> &nbsp; <span class="ajax-loader"></span></label>
             <ul class="first acfb-holder">
 …
                 </li>
             </ul>
             <?php if ( is_site_admin() ) : ?>
                 <input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( "This is a notice to all users.", "buddypress" ) ?>
 …
             <input type="hidden" name="send_to_usernames" id="send-to-usernames" value="<?php bp_message_get_recipient_usernames(); ?>" class="<?php bp_message_get_recipient_usernames() ?>" />
             <?php do_action( 'bp_after_messages_compose_content' ) ?>
 …
                 <input type="submit" value="<?php _e("Send", 'buddypress') ?> &raquo;" name="send" id="send" />
             </p>
             <?php wp_nonce_field( 'messages_send_message' ) ?>
         </form>
         <script type="text/javascript">
             document.getElementById("send-to-input").focus();

trunk/bp-themes/bp-sn-parent/messages/index.php

-                      r1905
+                      r2077
         <div class="content-header">
             <div class="messages-options">
+            <div class="messages-options">
                 <?php bp_messages_options() ?>
             </div>
 …
         <div id="content">
             <h2><?php _e( "Inbox", "buddypress" ); ?></h2>
             <?php do_action( 'template_notices' ) // (error/success feedback) ?>
             <?php do_action( 'bp_before_messages_inbox_content' ) ?>
             <?php bp_message_get_notices(); // (admin created site wide notices) ?>
             <?php if ( bp_has_message_threads() ) : ?>
                 <div class="pagination">
 …
                 </div>
                 <?php do_action( 'bp_before_messages_inbox_list' ) ?>
                 <table id="message-threads">
                     <?php while ( bp_message_threads() ) : bp_message_thread(); ?>
                         <tr id="m-<?php bp_message_thread_id() ?>"<?php if ( bp_message_thread_has_unread() ) : ?> class="unread"<?php else: ?> class="read"<?php endif; ?>>
                             <td width="1%">
 …
                                 <p><?php bp_message_thread_excerpt() ?></p>
                             </td>
                             <?php do_action( 'bp_messages_inbox_list_item' ) ?>
                             <td width="10%">
                                 <a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>" class="delete confirm"><?php _e("Delete", "buddypress"); ?></a> &nbsp;
+                                <a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>" class="delete confirm"><?php _e("Delete", "buddypress"); ?></a> &nbsp;
                                 <input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id() ?>" />
                             </td>
                         </tr>
                     <?php endwhile; ?>
                 </table>
                 <?php do_action( 'bp_after_messages_inbox_list' ) ?>
             <?php else: ?>
                 <div id="message" class="info">
                     <p><?php _e( 'You have no messages in your inbox.', 'buddypress' ); ?></p>
                 </div>
+                </div>
             <?php endif;?>

trunk/bp-themes/bp-sn-parent/messages/notices.php

-                      r1905
+                      r2077
     <div id="content">
         <div class="pagination">
             <div class="pagination-links">
                 <?php bp_messages_pagination() ?>
             </div>
         </div>
         <h2><?php _e( 'Sent Notices', 'buddypress' ); ?></h2>
         <?php do_action( 'template_notices' ) ?>
 …
             <?php do_action( 'bp_before_messages_notices_list' ) ?>
             <table id="message-threads" class="notices">
                 <?php while ( bp_message_threads() ) : bp_message_thread(); ?>
 …
                             <p class="date"><?php _e("Sent:", "buddypress"); ?> <?php bp_message_notice_post_date() ?></p>
                         </td>
                         <?php do_action( 'bp_messages_notices_list_item' ) ?>
                         <td width="4%">
                             <a href="<?php bp_message_activate_deactivate_link() ?>" class="confirm"><?php bp_message_activate_deactivate_text() ?></a>
                             <a href="<?php bp_message_notice_delete_link() ?>" class="confirm" title="<?php _e("Delete Message", "buddypress"); ?>"><?php _e("Delete", "buddypress"); ?></a>
+                            <a href="<?php bp_message_activate_deactivate_link() ?>" class="confirm"><?php bp_message_activate_deactivate_text() ?></a>
+                            <a href="<?php bp_message_notice_delete_link() ?>" class="confirm" title="<?php _e("Delete Message", "buddypress"); ?>"><?php _e("Delete", "buddypress"); ?></a>
                         </td>
                     </tr>
                 <?php endwhile; ?>
             </table>
             <?php do_action( 'bp_after_messages_notices_list' ) ?>
         <?php else: ?>
             <div id="message" class="info">
                 <p><?php _e("You have not sent any notices.", "buddypress"); ?></p>
             </div>
+            </div>
         <?php endif; ?>

trunk/bp-themes/bp-sn-parent/messages/sentbox.php

-                      r1905
+                      r2077
     <div class="content-header">
         <div class="messages-options">
+        <div class="messages-options">
             <?php bp_messages_options() ?>
         </div>
     </div>
     <div id="content">
+    <div id="content">
         <h2><?php _e("Sent Messages", "buddypress"); ?></h2>
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
 …
         <?php if ( bp_has_message_threads() ) : ?>
             <div class="pagination">
 …
                     <?php bp_messages_pagination() ?>
                 </div>
             </div>
             <?php do_action( 'bp_before_messages_sentbox_list' ) ?>
             <table id="message-threads">
                 <?php while ( bp_message_threads() ) : bp_message_thread(); ?>
                     <tr id="m-<?php bp_message_thread_id() ?>">
                         <td width="1%">
 …
                         <td width="10%">
                             <a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>" class="delete confirm"><?php _e("Delete", "buddypress"); ?></a> &nbsp;
+                            <a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>" class="delete confirm"><?php _e("Delete", "buddypress"); ?></a> &nbsp;
                             <input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id() ?>" />
                         </td>
                     </tr>
                 <?php endwhile; ?>
             </table>
             <?php do_action( 'bp_after_messages_sentbox_list' ) ?>
         <?php else: ?>
             <div id="message" class="info">
                 <p><?php _e("You have no sent messages.", "buddypress"); ?></p>
             </div>
+            </div>
         <?php endif;?>
         <?php do_action( 'bp_after_messages_sentbox_content' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/messages/view.php

-                      r1905
+                      r2077
     <div class="content-header">
     </div>
     <div id="content">
         <?php do_action( 'template_notices' ) ?>
         <?php do_action( 'bp_before_message_thread_content' ) ?>
         <?php if ( bp_thread_has_messages() ) : ?>
             <h2 id="message-subject"><?php bp_the_thread_subject() ?></h2>
             <p id="message-recipients">
                 <?php printf( __('Sent between %s and %s', 'buddypress'), bp_get_the_thread_recipients(), '<a href="' . bp_get_loggedin_user_link() . '" title="' . bp_get_loggedin_user_fullname() . '">' . bp_get_loggedin_user_fullname() . '</a>' ) ?>
             </p>
             <?php do_action( 'bp_before_message_thread_list' ) ?>
             <?php while ( bp_thread_messages() ) : bp_thread_the_message(); ?>
                 <div class="message-box<?php bp_the_thread_message_alt_class() ?>">
                     <div class="message-metadata">
                         <?php do_action( 'bp_before_message_meta' ) ?>
                         <?php bp_the_thread_message_sender_avatar( 'type=thumb&width=30&height=30' ) ?>
                         <h3><a href="<?php bp_the_thread_message_sender_link() ?>" title="<?php bp_the_thread_message_sender_name() ?>"><?php bp_the_thread_message_sender_name() ?></a></h3>
                         <small>
                             <?php bp_the_thread_message_time_since() ?>
                         </small>
                         <?php do_action( 'bp_after_message_meta' ) ?>
                     </div>
                     <?php do_action( 'bp_before_message_content' ) ?>
                     <div class="message-content">
                         <?php bp_the_thread_message_content() ?>
                     </div>
                     <?php do_action( 'bp_after_message_content' ) ?>
                     <div class="clear"></div>
                 </div>
             <?php endwhile; ?>
             <?php do_action( 'bp_after_message_thread_list' ) ?>
             <?php do_action( 'bp_before_message_thread_reply' ) ?>
             <form id="send-reply" action="<?php bp_messages_form_action() ?>" method="post" class="standard-form">
                 <div class="message-box">
                     <div class="message-metadata">
                         <?php do_action( 'bp_before_message_meta' ) ?>
+                        <?php do_action( 'bp_before_message_meta' ) ?>
                         <div class="avatar-box">
                             <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30 ) ); ?>
 …
                         <?php do_action( 'bp_after_message_meta' ) ?>
                     </div>
                     <div class="message-content">
                         <?php do_action( 'bp_before_message_reply_box' ) ?>
                         <textarea name="content" id="message_content" rows="15" cols="40"></textarea>
                         <?php do_action( 'bp_after_message_reply_box' ) ?>
                         <p class="submit">
                             <input type="submit" name="send" value="<?php _e( 'Send Reply', 'buddypress' ) ?> &rarr;" id="send_reply_button"/>
 …
                         <input type="hidden" name="subject" id="subject" value="<?php _e( 'Re: ', 'buddypress' ); echo str_replace( 'Re: ', '', bp_get_the_thread_subject() ); ?>" />
                         <?php wp_nonce_field( 'messages_send_message', 'send_message_nonce' ) ?>
                     </div>
                 </div>
             </form>
             <?php do_action( 'bp_after_message_thread_reply' ) ?>
         <?php endif; ?>

trunk/bp-themes/bp-sn-parent/optionsbar.php

-                      r1905
+                      r2077
 <div id="optionsbar">
     <h3><?php bp_get_options_title() ?></h3>
     <?php do_action( 'bp_inside_before_options_bar' ) ?>
     <?php if ( bp_has_options_avatar() ) : ?>
 …
     <?php endif; ?>
         <ul id="options-nav">
             <?php bp_get_options_nav() ?>
         </ul>
     <?php do_action( 'bp_inside_after_options_bar' ) ?>

trunk/bp-themes/bp-sn-parent/page.php

-                      r1905
+                      r2077
         <?php do_action( 'bp_before_blog_page' ) ?>
         <div class="page" id="blog-page">
             <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
                 <h2 class="pagetitle"><?php the_title(); ?></h2>
                 <div class="post" id="post-<?php the_ID(); ?>">
                     <div class="entry">
                         <?php the_content( __( '<p class="serif">Read the rest of this page &raquo;</p>', 'buddypress' ) ); ?>
                         <?php wp_link_pages( array( 'before' => __( '<p><strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p>', 'next_or_number' => 'number')); ?>
                         <?php edit_post_link( __( 'Edit this entry.', 'buddypress' ), '<p>', '</p>'); ?>
                     </div>
                 </div>
             <?php endwhile; endif; ?>
         </div>
         <?php do_action( 'bp_after_blog_page' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/plugin-template.php

r1905	r2077
7	7	<div id="content">
8	8	<h2><?php do_action('bp_template_title') ?></h2>
9
	9
10	10	<?php do_action('bp_template_content') ?>
11	11	</div>

trunk/bp-themes/bp-sn-parent/profile/change-avatar.php

-                      r1905
+                      r2077
     <div id="content">
         <h2><?php _e( 'Change Avatar', 'buddypress' ) ?></h2>
         <?php do_action( 'template_notices' ) ?>
         <?php do_action( 'bp_before_profile_avatar_upload_content' ) ?>
         <p><?php _e( 'Your avatar will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress') ?></p>
         <form action="" method="post" id="avatar-upload-form" enctype="multipart/form-data">
+        <form action="" method="post" id="avatar-upload-form" enctype="multipart/form-data">
             <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
                 <h3><?php _e( 'Your Current Avatar', 'buddypress' ) ?></h3>
                 <p id="current-avatar">
                     <?php bp_displayed_user_avatar( 'type=full') ?>
                     <?php bp_displayed_user_avatar( 'type=thumb' ) ?>
                 </p>
                 <?php if ( bp_get_user_has_avatar() ) : ?>
                     <div class="generic-button" id="delete-avatar-button">
 …
                     </div>
                 <?php endif; ?>
                 <h3><?php _e( 'Upload a New Avatar', 'buddypress' ) ?></h3>
                 <p><?php _e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Image\' to proceed.', 'buddypress' ) ?></p>
                 <p id="avatar-upload">
                     <input type="file" name="file" id="file" />
+                    <input type="file" name="file" id="file" />
                     <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />
                     <input type="hidden" name="action" id="action" value="bp_avatar_upload" />
 …
                 <?php wp_nonce_field( 'bp_avatar_upload' ) ?>
             <?php endif; ?>
             <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
                 <h3><?php _e( 'Crop Your New Avatar', 'buddypress' ) ?></h3>
                 <img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ) ?>" />
                 <div id="avatar-crop-pane">
                     <img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ) ?>" />
 …
                 <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />
                 <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />
                 <input type="hidden" id="x" name="x" />
 …
                 <?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>
             <?php endif; ?>
         </form>
         <?php do_action( 'bp_after_profile_avatar_upload_content' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/profile/edit.php

-                      r1920
+                      r2077
     <div class="content-header">
         <ul class="content-header-nav">
             <?php bp_profile_group_tabs(); ?>
         </ul>
     </div>
 …
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
         <?php do_action( 'bp_before_profile_edit_content' ) ?>
         <?php if ( bp_has_profile( 'profile_group_id=' . bp_get_current_profile_group_id() ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
 …
             <?php do_action( 'bp_before_profile_field_content' ) ?>
                 <h2><?php printf( __( "Editing '%s'", "buddypress" ), bp_get_the_profile_group_name() ); ?></h2>
                 <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
                     <div<?php bp_field_css_class( 'editfield' ) ?>>
                         <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
                             <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                             <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value() ?>" />
                         <?php endif; ?>
                         <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
                             <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                             <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value() ?></textarea>
                         <?php endif; ?>
                         <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
                             <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                             <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
                                 <?php bp_the_profile_field_options() ?>
                             </select>
                         <?php endif; ?>
                         <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
                             <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                             <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
                                 <?php bp_the_profile_field_options() ?>
                             </select>
                         <?php endif; ?>
                         <?php if ( 'radio' == bp_get_the_profile_field_type() ) : ?>
                             <div class="radio">
                                 <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
                                 <?php bp_the_profile_field_options() ?>
                                 <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
                                     <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
                                 <?php endif; ?>
                             </div>
                         <?php endif; ?>
+                        <?php endif; ?>
                         <?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
                             <div class="checkbox">
                                 <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
                                 <?php bp_the_profile_field_options() ?>
                             </div>
                         <?php endif; ?>
+                            </div>
+                        <?php endif; ?>
                         <?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
                             <div class="datebox">
                                 <label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                                 <select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name() ?>_day">
                                     <?php bp_the_profile_field_options( 'type=day' ) ?>
                                 </select>
                                 <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name() ?>_month">
                                     <?php bp_the_profile_field_options( 'type=month' ) ?>
                                 </select>
                                 <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name() ?>_year">
                                     <?php bp_the_profile_field_options( 'type=year' ) ?>
                                 </select>
+                                </select>
                             </div>
                         <?php endif; ?>
+                        <?php endif; ?>
                         <?php do_action( 'bp_custom_profile_edit_fields' ) ?>
                         <p class="description"><?php bp_the_profile_field_description() ?></p>
                     </div>
 …
             <?php do_action( 'bp_after_profile_field_content' ) ?>
             <input type="submit" name="profile-group-edit-submit" id="profile-group-edit-submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?> " />
             <input type="hidden" name="field_ids" id="field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
             <?php wp_nonce_field( 'bp_xprofile_edit' ) ?>
         </form>
         <?php endwhile; endif; ?>
         <?php do_action( 'bp_after_profile_edit_content' ) ?>

trunk/bp-themes/bp-sn-parent/profile/index.php

-                      r1905
+                      r2077
     <?php do_action( 'bp_before_profile_content' ) ?>
     <div class="left-menu">
         <!-- Profile Menu (Avatar, Add Friend, Send Message buttons etc) -->
 …
     <div class="main-column">
         <div class="inner-tube">
             <?php /* Profile Header (Name & Status) */ ?>
             <?php locate_template( array( 'profile/profile-header.php' ), true ) ?>
             <?php /* Profile Data Loop */ ?>
             <?php locate_template( array( 'profile/profile-loop.php' ), true ) ?>
             <?php do_action( 'bp_before_profile_activity_loop' ) ?>
             <?php /* Latest Activity Loop */ ?>
             <?php if ( function_exists( 'bp_activity_install')) : ?>
                 <?php do_action( 'bp_before_profile_activity_widget' ) ?>
 …
                                     <?php bp_activity_avatar() ?>
                                 </div>
                                 <?php bp_activity_content() ?>
                             </li>
 …
                     <?php endif;?>
                 </div>
                 <?php do_action( 'bp_after_profile_activity_widget' ) ?>
             <?php endif; ?>
             <?php do_action( 'bp_after_profile_activity_loop' ) ?>
             <?php do_action( 'bp_before_profile_random_groups_loop' ) ?>
             <?php /* Random Groups Loop */ ?>
             <?php if ( function_exists( 'bp_has_groups' ) ) : ?>
 …
                 <?php if ( bp_has_groups( 'type=random&max=5' ) ) : ?>
                     <div class="bp-widget">
                         <h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php bp_group_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
                         <ul class="horiz-gallery">
                         <?php while ( bp_groups() ) : bp_the_group(); ?>
 …
                     <?php do_action( 'bp_after_profile_groups_widget' ) ?>
                 <?php endif; ?>
             <?php endif; ?>
             <?php do_action( 'bp_after_profile_random_groups_loop' ) ?>
             <?php do_action( 'bp_before_profile_random_friends_loop' ) ?>
             <?php /* Random Friends Loop */ ?>
             <?php if ( function_exists( 'bp_has_friendships' ) ) : ?>
 …
                 <?php if ( bp_has_friendships( 'type=random&max=5' ) ) : ?>
                     <div class="bp-widget">
                         <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> (<?php bp_friend_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
                         <ul class="horiz-gallery">
                         <?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
 …
                             </li>
                         <?php endwhile; ?>
                         </ul>
+                        </ul>
                     </div>
                 <?php endif; ?>
                 <?php do_action( 'bp_after_profile_friends_widget' ) ?>
             <?php endif; ?>
             <?php do_action( 'bp_after_profile_random_friends_loop' ) ?>
             <?php do_action( 'bp_before_profile_wire_loop' ); /* Deprecated -> */ do_action( 'bp_custom_profile_boxes' ) ?>
 …
             <?php do_action( 'bp_after_profile_wire_loop' ) ?>
         </div>

trunk/bp-themes/bp-sn-parent/profile/profile-header.php

-                      r1905
+                      r2077
 <div id="profile-name">
     <h1 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_user_fullname() ?></a></h1>
     <?php if ( function_exists( 'bp_the_status' ) ) : ?>
 …
     <?php endif; ?>
     <?php do_action( 'bp_profile_header_content' ) ?>
 </div>

trunk/bp-themes/bp-sn-parent/profile/profile-loop.php

-                      r1905
+                      r2077
 <?php if ( function_exists('xprofile_get_profile') ) : ?>
     <?php if ( bp_has_profile() ) : ?>
+    <?php if ( bp_has_profile() ) : ?>
         <?php while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
             <?php if ( bp_profile_group_has_fields() ) : ?>
                 <?php do_action( 'bp_before_profile_field_content' ) ?>
                 <div class="bp-widget <?php bp_the_profile_group_slug() ?>">
                     <h4><?php bp_the_profile_group_name() ?></h4>
                     <table class="profile-fields">
                         <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
 …
                             <?php if ( bp_field_has_data() ) : ?>
                                 <tr<?php bp_field_css_class() ?>>
                                     <td class="label">
                                         <?php bp_the_profile_field_name() ?>
 …
                                         <?php bp_the_profile_field_value() ?>
                                     </td>
                                 </tr>
                             <?php endif; ?>
                             <?php do_action( 'bp_profile_field_item' ) ?>
 …
                 <?php do_action( 'bp_after_profile_field_content' ) ?>
             <?php endif; ?>
+            <?php endif; ?>
         <?php endwhile; ?>
         <div class="button-block">
             <?php if ( bp_is_home() || is_site_admin() ) : ?>
                 <?php bp_edit_profile_button() ?>
             <?php endif; ?>
             <?php do_action( 'bp_profile_field_buttons' ) ?>
         </div>
     <?php else: ?>
         <div id="message" class="info">
             <p><?php _e( 'Sorry, this person does not have a public profile.', 'buddypress' ) ?></p>
         </div>
     <?php endif;?>
 <?php else : ?>
     <?php bp_core_get_wp_profile() ?>

trunk/bp-themes/bp-sn-parent/profile/profile-menu.php

-                      r1982
+                      r2077
 <div class="button-block">
     <?php if ( function_exists('bp_add_friend_button') ) : ?>
         <?php bp_add_friend_button() ?>
     <?php endif; ?>
     <?php if ( function_exists('bp_send_message_button') ) : ?>
         <?php bp_send_message_button() ?>
     <?php endif; ?>
     <?php do_action( 'bp_before_profile_menu_buttons' ) ?>

trunk/bp-themes/bp-sn-parent/registration/activate.php

-                      r1905
+                      r2077
         <div class="page" id="activate-page">
             <div class="register bp_core_widget_welcome">
                 <?php do_action( 'template_notices' ) ?>
                 <?php if ( bp_account_was_activated() ) : ?>
                     <h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ) ?></h2>
                     <?php do_action( 'bp_before_activate_content' ) ?>
                     <p><?php _e( 'Your account was activated successfully! You can now log in with the username and password you provided when you signed up.', 'buddypress' ) ?></p>
                 <?php else : ?>
                     <h2 class="widgettitle"><?php _e( 'Activate your Account', 'buddypress' ) ?></h2>
                     <?php do_action( 'bp_before_activate_content' ) ?>
                     <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ) ?></p>
                     <form action="" method="get" class="standard-form" id="activation-form">
                         <label for="key"><?php _e( 'Activation Key:', 'buddypress' ) ?></label>
                         <input type="text" name="key" id="key" value="" />
                         <p class="submit">
                             <input type="submit" name="submit" value="<?php _e( 'Activate', 'buddypress' ) ?> &rarr;" />
                         </p>
                     </form>
                 <?php endif; ?>
                 <?php do_action( 'bp_after_activate_content' ) ?>
             </div>
         </div>
 …
     </div>
     <?php get_sidebar() ?>

trunk/bp-themes/bp-sn-parent/registration/register.php

-                      r1983
+                      r2077
         <?php do_action( 'bp_before_register_page' ) ?>
         <div class="page" id="register-page">
             <form action="" name="signup_form" id="signup_form" class="standard-form" method="post" enctype="multipart/form-data">
             <?php if ( 'request-details' == bp_get_current_signup_step() ) : ?>
                 <h2 class="pagetitle"><?php _e( 'Sign Up', 'buddypress' ) ?></h2>
                 <?php do_action( 'template_notices' ) ?>
                 <p><?php _e( 'Registering for this site is easy, just fill in the fields below and we\'ll get a new account set up for you in no time.', 'buddypress' ) ?></p>
                 <?php do_action( 'bp_before_account_details_fields' ) ?>
                 <div class="register-section" id="basic-details-section">
                     <?php /***** Basic Account Details ******/ ?>
                     <h3><?php _e( 'Account Details', 'buddypress' ) ?></h3>
                     <label for="signup_username"><?php _e( 'Username', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' ) ?></label>
                     <?php do_action( 'bp_signup_username_errors' ) ?>
 …
                     <?php do_action( 'bp_signup_password_confirm_errors' ) ?>
                     <input type="password" name="signup_password_confirm" id="signup_password_confirm" value="" />
                 </div>
                 <?php do_action( 'bp_after_account_details_fields' ) ?>
 …
                 <div class="register-section" id="profile-details-section">
                     <h3><?php _e( 'Profile Details', 'buddypress' ) ?></h3>
                     <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
                     <?php if ( function_exists( 'bp_has_profile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
 …
                             <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
                                 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                                 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
                                 <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value() ?>" />
                             <?php endif; ?>
                             <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
                                 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                                 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
                                 <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value() ?></textarea>
                             <?php endif; ?>
 …
                                     <?php bp_the_profile_field_options() ?>
                                 </select>
                             <?php endif; ?>
 …
                                 <div class="radio">
                                     <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
                                     <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
                                     <?php bp_the_profile_field_options() ?>
                                     <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
                                         <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
 …
                                 </div>
                             <?php endif; ?>
+                            <?php endif; ?>
                             <?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
 …
                                 <div class="checkbox">
                                     <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></span>
                                     <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
                                     <?php bp_the_profile_field_options() ?>
                                 </div>
                             <?php endif; ?>
+                                </div>
+                            <?php endif; ?>
                             <?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
 …
                                     <label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></label>
                                     <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>
                                     <select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name() ?>_day">
                                         <?php bp_the_profile_field_options( 'type=day' ) ?>
                                     </select>
                                     <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name() ?>_month">
                                         <?php bp_the_profile_field_options( 'type=month' ) ?>
                                     </select>
                                     <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name() ?>_year">
                                         <?php bp_the_profile_field_options( 'type=year' ) ?>
                                     </select>
+                                    </select>
                                 </div>
                             <?php endif; ?>
+                            <?php endif; ?>
                             <?php do_action( 'bp_custom_profile_edit_fields' ) ?>
                             <p class="description"><?php bp_the_profile_field_description() ?></p>
                         </div>
 …
                     <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
                 </div>
                 <?php endwhile; endif; endif; ?>
                 <?php do_action( 'bp_after_signup_profile_fields' ) ?>
                 <?php if ( 'all' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() ) : ?>
 …
                     <div class="register-section" id="blog-details-section">
                         <h3><?php _e( 'Blog Details', 'buddypress' ) ?></h3>
                         <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new blog', 'buddypress' ) ?></p>
                         <div id="blog-details">
                             <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' ) ?></label>
                             <?php do_action( 'bp_signup_blog_url_errors' ) ?>
                             <?php if ( 'yes' == VHOST ) : ?>
                                 http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" /> .<?php echo str_replace( 'http://', '', site_url() ) ?>
                             <?php else : ?>
                                 <?php echo site_url() ?>/ <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" />
                             <?php endif; ?>
+                                <?php echo site_url() ?>/ <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" />
+                            <?php endif; ?>
                             <label for="signup_blog_title"><?php _e( 'Blog Title', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' ) ?></label>
                             <?php do_action( 'bp_signup_blog_title_errors' ) ?>
 …
                             <span class="label"><?php _e( 'I would like my blog to appear in search engines, and in public listings around this site', 'buddypress' ) ?>:</span>
                             <?php do_action( 'bp_signup_blog_privacy_errors' ) ?>
                             <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_public" value="public"<?php if ( 'public' == bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes' ) ?></label>
                             <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_private" value="private"<?php if ( 'private' == bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'No' ) ?></label>
                         </div>
+                        </div>
                     </div>
                     <?php do_action( 'bp_after_blog_details_fields' ) ?>
                 <?php endif; ?>
                 <?php do_action( 'bp_before_registration_submit_buttons' ) ?>
                 <p class="submit">
                     <input type="submit" name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?> &rarr;" />
 …
             <?php endif; // request-details signup step ?>
             <?php if ( 'completed-confirmation' == bp_get_current_signup_step() ) : ?>
                 <h2 class="pagetitle"><?php _e( 'Sign Up Complete!', 'buddypress' ) ?></h2>
                 <?php do_action( 'template_notices' ) ?>
                 <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ) ?></p>
                 <?php if ( !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?>
                     <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
                         <h3><?php _e( 'Your Current Avatar', 'buddypress' ) ?></h3>
                         <p><?php _e( "We've fetched an avatar for your new account. If you'd like to change this, why not upload a new one while you wait for your activation email?", 'buddypress' ) ?></p>
                         <div id="signup-avatar">
                             <?php bp_signup_avatar() ?>
                         </div>
                         <p>
                             <input type="file" name="file" id="file" />
+                            <input type="file" name="file" id="file" />
                             <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />
                             <input type="hidden" name="action" id="action" value="bp_avatar_upload" />
 …
                         <?php wp_nonce_field( 'bp_avatar_upload' ) ?>
                     <?php endif; ?>
                     <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
                         <h3><?php _e( 'Crop Your New Avatar', 'buddypress' ) ?></h3>
                         <img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ) ?>" />
                         <div id="avatar-crop-pane">
                             <img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ) ?>" />
 …
                         <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />
                         <input type="hidden" name="signup_email" id="signup_email" value="<?php bp_signup_email_value() ?>" />
                         <input type="hidden" name="signup_username" id="signup_username" value="<?php bp_signup_username_value() ?>" />
                         <input type="hidden" name="signup_avatar_dir" id="signup_avatar_dir" value="<?php bp_signup_avatar_dir_value() ?>" />
                         <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />
                         <input type="hidden" id="x" name="x" />
 …
                         <?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>
                     <?php endif; ?>
                 <?php else : ?>
                     <p><?php _e( "We've fetched an avatar for your new account. If you'd like to change this you can use the <a href=\"http://gravatar.com\">Gravatar</a> service to upload a new one.", 'buddypress' ) ?></p>
                 <?php endif; ?>
             <?php endif; // completed-confirmation signup step ?>
             <?php do_action( 'bp_custom_signup_steps' ) ?>
             </form>
         </div>
         <?php do_action( 'bp_after_register_page' ) ?>
     </div>
     <?php get_sidebar(); ?>

trunk/bp-themes/bp-sn-parent/search.php

-                      r1952
+                      r2077
         <?php do_action( 'bp_before_blog_search' ) ?>
         <div class="page" id="blog-search">
             <h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
             <?php if (have_posts()) : ?>
                 <h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ) ?></h3>
 …
                     <div class="post">
                         <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
                         <small><?php the_time('l, F jS, Y') ?></small>
                         <p class="postmetadata"><?php _e( 'Posted in', 'buddypress' ) ?> <?php the_category(', ') ?> | <?php edit_post_link( __( 'Edit', 'buddypress' ), '', ' | '); ?>  <?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></p>
                         <?php do_action( 'bp_blog_post' ) ?>
 …
         </div>
         <?php do_action( 'bp_after_blog_search' ) ?>
     </div>

trunk/bp-themes/bp-sn-parent/sidebar.php

-                      r1905
+                      r2077
 <div id="sidebar">
     <?php do_action( 'bp_inside_before_blog_sidebar' ) ?>
     <?php if ( !function_exists('dynamic_sidebar')
             || !dynamic_sidebar('blog-sidebar') ) : ?>
             <div class="widget-error">
                 <?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=blog-sidebar"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
 …
     <?php endif; ?>
     <?php do_action( 'bp_inside_after_blog_sidebar' ) ?>
 </div>

trunk/bp-themes/bp-sn-parent/single.php

-                      r1905
+                      r2077
         <?php do_action( 'bp_before_blog_single_post' ) ?>
         <div class="page" id="blog-single">
             <h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
             <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
                 <div class="item-options">
                     <div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
                     <div class="alignright"><?php previous_posts_link( __( 'Next Entries &raquo;', 'buddypress' ) ) ?></div>
                 </div>
 …
                     <?php do_action( 'bp_before_blog_post' ) ?>
                     <h3><a href="<?php echo get_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
                     <div class="entry">
                         <?php the_content( __( '<p class="serif">Read the rest of this entry &raquo;</p>', 'buddypress' ) ); ?>
 …
             <?php endif; ?>
         </div>

trunk/bp-themes/bp-sn-parent/status/post-form.php

-                      r1905
+                      r2077
     <label for="status-update-input"><?php _e( 'What are you up to?', 'buddypress' ) ?></label>
     <textarea id="status-update-input" name="status-update-input" tabindex="99"></textarea>
     <?php do_action( 'bp_after_status_update_input' ) ?>
     <div id="status-update-buttons">
         <input type="submit" name="status-update-post" id="status-update-post" tabindex="100" value="<?php _e( 'Update', 'buddypress' ) ?>" />
         <?php do_action( 'bp_status_update_buttons' ) ?>
     </div>
     <?php wp_nonce_field( 'bp_status_add_status', '_wpnonce_add_status' ) ?>
 </form>

trunk/bp-themes/bp-sn-parent/style.css

r2042	r2077
1		/*
	1	/*
2	2	Theme Name: BuddyPress Social Network Parent Theme
3	3	Theme URI: http://buddypress.org/extend/themes/

trunk/bp-themes/bp-sn-parent/userbar.php

-                      r1996
+                      r2077
     <?php do_action( 'bp_inside_before_user_bar' ) ?>
     <?php if ( is_user_logged_in() ) : ?>
         <p class="avatar">
             <?php bp_loggedin_user_avatar( 'type=thumb' ) ?>
         </p>
         <ul id="bp-nav">
             <?php bp_get_loggedin_user_nav() ?>
         </ul>
     <?php else : ?>
         <p class="avatar">
             <img src="<?php echo get_template_directory_uri() . '/_inc/images/mystery-man.jpg' ?>" alt="No User" width="50" height="50" />
         </p>
         <p id="login-text"><?php _e( 'You must log in to access your account.', 'buddypress' ) ?></p>
         <form name="userbar_loginform" id="userbar_loginform" action="<?php echo site_url( 'wp-login.php', 'login' ) ?>" method="post">
             <p>
 …
             </p>
         </form>
     <?php endif ?>
     <?php do_action( 'bp_inside_after_user_bar' ) ?>

trunk/bp-wire/bp-wire-classes.php

-                      r1905
+                      r2077
 class BP_Wire_Post {
     var $table_name;
     var $id;
     var $item_id;
 …
     var $content;
     var $date_posted;
     function bp_wire_post( $table_name, $id = null, $populate = true ) {
         $this->table_name = $table_name;
         if ( $id ) {
             $this->id = $id;
             if ( $populate )
                 $this->populate();
+        }
+    }
     function populate() {
         global $wpdb, $bp;
 …
+        }
+    }
     function save() {
         global $wpdb, $bp;
         $this->item_id = apply_filters( 'bp_wire_post_item_id_before_save', $this->item_id, $this->id );
         $this->user_id = apply_filters( 'bp_wire_post_user_id_before_save', $this->user_id, $this->id );
         $this->content = apply_filters( 'bp_wire_post_content_before_save', $this->content, $this->id );
+        $this->item_id = apply_filters( 'bp_wire_post_item_id_before_save', $this->item_id, $this->id );
+        $this->user_id = apply_filters( 'bp_wire_post_user_id_before_save', $this->user_id, $this->id );
+        $this->content = apply_filters( 'bp_wire_post_content_before_save', $this->content, $this->id );
         $this->date_posted = apply_filters( 'bp_wire_post_date_posted_before_save', $this->date_posted, $this->id );
         do_action( 'bp_wire_post_before_save', $this );
+        do_action( 'bp_wire_post_before_save', $this );
         if ( $this->id ) {
             $sql = $wpdb->prepare(
                 "UPDATE {$this->table_name} SET
                     item_id = %d,
                     user_id = %d,
                     content = %s,
+            $sql = $wpdb->prepare(
+                "UPDATE {$this->table_name} SET
+                    item_id = %d,
+                    user_id = %d,
+                    content = %s,
                     date_posted = FROM_UNIXTIME(%d)
                 WHERE
                     id = %d
                 ",
                     $this->item_id,
                     $this->user_id,
                     $this->content,
                     $this->date_posted,
+                    $this->item_id,
+                    $this->user_id,
+                    $this->content,
+                    $this->date_posted,
                     $this->id
             );
         } else {
             $sql = $wpdb->prepare(
                 "INSERT INTO {$this->table_name} (
+            $sql = $wpdb->prepare(
+                "INSERT INTO {$this->table_name} (
                     item_id,
                     user_id,
 …
                     %d, %d, %s, FROM_UNIXTIME(%d)
                 )",
                     $this->item_id,
                     $this->user_id,
                     $this->content,
                     $this->date_posted,
                     $this->id
+                    $this->item_id,
+                    $this->user_id,
+                    $this->content,
+                    $this->date_posted,
+                    $this->id
             );
+        }
         $result = $wpdb->query($sql);
         if ( !$this->id )
             $this->id = $wpdb->insert_id;
         do_action( 'bp_wire_post_after_save', $this );
+        do_action( 'bp_wire_post_after_save', $this );
         return $result;
+    }
     function delete() {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$this->table_name} WHERE id = %d", $this->id ) );
+    }
     /* Static Functions */
     function get_all_for_item( $item_id, $table_name, $page = false, $limit = false ) {
         global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
         $wire_posts = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$table_name} WHERE item_id = %d ORDER BY date_posted DESC $pag_sql", $item_id ) );
         $count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$table_name} WHERE item_id = %d", $item_id ) );
         return array( 'wire_posts' => $wire_posts, 'count' => $count );
+    }
     function delete_all_for_item( $item_id, $table_name ) {
         global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$table_name} WHERE item_id = %d", $item_id ) );
+    }

trunk/bp-wire/bp-wire-filters.php

-                      r1925
+                      r2077
 function bp_wire_filter_kses( $content ) {
     global $allowedtags;
     $wire_allowedtags = $allowedtags;
     $wire_allowedtags['img'] = array();
+    $wire_allowedtags['img'] = array();
     $wire_allowedtags['img']['src'] = array();
     $wire_allowedtags['img']['alt'] = array();

trunk/bp-wire/bp-wire-templatetags.php

-                      r1910
+                      r2077
     var $wire_posts;
     var $wire_post;
     var $in_the_loop;
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_wire_post_count;
     var $can_post;
     var $table_name;
     function bp_wire_posts_template( $item_id, $component_slug, $can_post, $per_page, $max ) {
         global $bp;
 …
         } else
             $this->table_name = $bp->{$bp->active_components[$component_slug]}->table_name_wire;
         $this->pag_page = isset( $_REQUEST['wpage'] ) ? intval( $_REQUEST['wpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 …
         $this->wire_posts = BP_Wire_Post::get_all_for_item( $item_id, $this->table_name, $this->pag_page, $this->pag_num );
         $this->total_wire_post_count = (int)$this->wire_posts['count'];
         $this->wire_posts = $this->wire_posts['wire_posts'];
         $this->wire_post_count = count($this->wire_posts);
         if ( is_site_admin() || ( (int)get_site_option('non-friend-wire-posting') && ( $bp->current_component == $bp->profile->slug || $bp->current_component == $bp->wire->slug ) ) )
             $this->can_post = 1;
         else
             $this->can_post = $can_post;
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( 'wpage', '%#%', $bp->displayed_user->domain ),
 …
             'mid_size' => 1
         ));
+    }
+    }
     function has_wire_posts() {
         if ( $this->wire_post_count )
             return true;
         return false;
+    }
     function next_wire_post() {
         $this->current_wire_post++;
         $this->wire_post = $this->wire_posts[$this->current_wire_post];
         return $this->wire_post;
+    }
     function rewind_wire_posts() {
         $this->current_wire_post = -1;
 …
+        }
+    }
     function user_wire_posts() {
+    function user_wire_posts() {
         if ( $this->current_wire_post + 1 < $this->wire_post_count ) {
             return true;
 …
         return false;
+    }
     function the_wire_post() {
         global $wire_post;
 …
 function bp_has_wire_posts( $args = '' ) {
     global $wire_posts_template, $bp;
     $defaults = array(
         'item_id' => false,
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
     if ( !$item_id )
         return false;
     $wire_posts_template = new BP_Wire_Posts_Template( $item_id, $component_slug, $can_post, $per_page, $max );
+    $wire_posts_template = new BP_Wire_Posts_Template( $item_id, $component_slug, $can_post, $per_page, $max );
     return apply_filters( 'bp_has_wire_posts', $wire_posts_template->has_wire_posts(), &$wire_posts_template );
+}
 …
     if ( !$item_id )
         return false;
     if ( !$empty_message )
         $empty_message = __("There are currently no wire posts.", 'buddypress');
     if ( !$title )
         $title = __('Wire', 'buddypress');
 …
     $bp_wire_can_post = $can_post;
     $bp_wire_show_email_notify = $show_email_notify;
     locate_template( array( '/wire/post-list.php' ), true );
+}
 …
         return apply_filters( 'bp_get_wire_title', $bp_wire_header );
+    }
 function bp_wire_item_id( $deprecated = false ) {
     global $bp_item_id;
     if ( $deprecated )
         echo bp_get_wire_item_id();
 …
         return apply_filters( 'bp_get_wire_no_posts_message', $bp_wire_msg );
+    }
 function bp_wire_can_post() {
     global $bp_wire_can_post;
 …
 function bp_wire_post_id( $deprecated = true ) {
     global $wire_posts_template;
     if ( !$deprecated )
         return bp_get_wire_post_id();
 …
     if ( $wire_posts_template->total_wire_post_count > $wire_posts_template->pag_num )
         return true;
     return false;
+}
 …
         return apply_filters( 'bp_get_wire_pagination', $wire_posts_template->pag_links );
+    }
 function bp_wire_pagination_count() {
     echo bp_get_wire_pagination_count();
 …
         $from_num = intval( ( $wire_posts_template->pag_page - 1 ) * $wire_posts_template->pag_num ) + 1;
         $to_num = ( $from_num + ( $wire_posts_template->pag_num - 1) > $wire_posts_template->total_wire_post_count ) ? $wire_posts_template->total_wire_post_count : $from_num + ( $wire_posts_template->pag_num - 1);
         return apply_filters( 'bp_get_wire_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $wire_posts_template->total_wire_post_count ) );
+    }
+        $to_num = ( $from_num + ( $wire_posts_template->pag_num - 1) > $wire_posts_template->total_wire_post_count ) ? $wire_posts_template->total_wire_post_count : $from_num + ( $wire_posts_template->pag_num - 1);
+        return apply_filters( 'bp_get_wire_pagination_count', sprintf( __( 'Viewing post %d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $wire_posts_template->total_wire_post_count ) );
+    }
 function bp_wire_ajax_loader_src() {
     echo bp_get_wire_ajax_loader_src();
 …
     function bp_get_wire_post_date() {
         global $wire_posts_template;
         return apply_filters( 'bp_get_wire_post_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format'), $wire_posts_template->wire_post->date_posted ) );
+    }
 …
 function bp_wire_post_author_name( $deprecated = true ) {
     global $wire_posts_template;
     if ( !$deprecated )
         return bp_get_wire_post_author_name();
 …
 function bp_wire_get_post_form() {
     global $wire_posts_template;
     if ( is_user_logged_in() && $wire_posts_template->can_post )
         locate_template( array( '/wire/post-form.php' ), true );
+        locate_template( array( '/wire/post-form.php' ), true );
+}
 …
         return bp_get_wire_poster_date();
     else
         echo bp_get_wire_poster_date();
+        echo bp_get_wire_poster_date();
+}
     function bp_get_wire_poster_date() {
         return apply_filters( 'bp_get_wire_poster_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format' ), date("Y-m-d H:i:s") ) );
+        return apply_filters( 'bp_get_wire_poster_date', mysql2date( get_blog_option( BP_ROOT_BLOG, 'date_format' ), date("Y-m-d H:i:s") ) );
+    }

trunk/bp-wire/deprecated/bp-wire-deprecated.php

-                      r1905
+                      r2077
+ *
  * This file contains functions that are deprecated.
  * You should not under any circumstance use these functions as they are
+ * You should not under any circumstance use these functions as they are
  * either no longer valid, or have been replaced with something much more awesome.
+ *
 …
  * Of course, things will still work if you use these functions but you will
  * be the laughing stock of the BuddyPress community. We will all point and laugh at
  * you. You'll also be making things harder for yourself in the long run,
+ * you. You'll also be making things harder for yourself in the long run,
  * and you will miss out on lovely performance and functionality improvements.
+ *
+ *
  * If you've checked you are not using any deprecated functions and finished your little
  * dance, you can add the following line to your wp-config.php file to prevent any of
 …
     if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return $template;
     /* Enqueue the structure CSS file to give basic positional formatting for components */
     wp_enqueue_style( 'bp-wire-structure', BP_PLUGIN_URL . '/bp-wire/deprecated/css/structure.css' );
+    wp_enqueue_style( 'bp-wire-structure', BP_PLUGIN_URL . '/bp-wire/deprecated/css/structure.css' );
+}
 add_action( 'bp_styles', 'bp_wire_add_structure_css' );
 …
             <span class="ajax-loader"></span>
         </div>
         <div id="wire-pagination" class="pagination-links">
             <?php bp_wire_pagination() ?>
         </div>
         <ul id="wire-post-list">
         <?php $counter = 0; ?>
 …
                 <div class="wire-post-metadata">
                     <?php bp_wire_post_author_avatar() ?>
                     <?php _e( 'On', 'buddypress' ) ?> <?php bp_wire_post_date() ?>
+                    <?php _e( 'On', 'buddypress' ) ?> <?php bp_wire_post_date() ?>
                     <?php bp_wire_post_author_name() ?> <?php _e( 'said:', 'buddypress' ) ?>
                     <?php bp_wire_delete_link() ?>
                 </div>
                 <div class="wire-post-content">
                     <?php bp_wire_post_content() ?>
 …
         <?php endwhile; ?>
         </ul>
     <?php else: ?>
 …
     <?php endif; ?>
     <input type="hidden" name="bp_wire_item_id" id="bp_wire_item_id" value="<?php echo attribute_escape( $_POST['bp_wire_item_id'] ) ?>" />
     <?php

trunk/bp-xprofile.php

-                      r2059
+                      r2077
 /* Include deprecated functions if settings allow */
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
     require ( BP_PLUGIN_DIR . '/bp-xprofile/deprecated/bp-xprofile-deprecated.php' );
+    require ( BP_PLUGIN_DIR . '/bp-xprofile/deprecated/bp-xprofile-deprecated.php' );
 /* Assign the base group and fullname field names to constants to use in SQL statements */
 …
+ *
  * Set up the database tables needed for the xprofile component.
+ *
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     if ( '' == get_site_option( 'bp-xprofile-base-group-name' ) )
         update_site_option( 'bp-xprofile-base-group-name', 'Base' );
     if ( '' == get_site_option( 'bp-xprofile-fullname-field-name' ) )
         update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
+        update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
     $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (
               id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
               KEY can_delete (can_delete)
     ) {$charset_collate};";
     $sql[] = "CREATE TABLE {$bp->profile->table_name_fields} (
               id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
               KEY is_required (is_required)
     ) {$charset_collate};";
     $sql[] = "CREATE TABLE {$bp->profile->table_name_data} (
               id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
 …
               KEY user_id (user_id)
     ) {$charset_collate};";
     if ( '' == get_site_option( 'bp-xprofile-db-version' ) ) {
         $sql[] = "INSERT INTO {$bp->profile->table_name_groups} VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
         $sql[] = "INSERT INTO {$bp->profile->table_name_fields} (
+        $sql[] = "INSERT INTO {$bp->profile->table_name_fields} (
                     id, group_id, parent_id, type, name, is_required, can_delete
                   ) VALUES (
 …
                   );";
+    }
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta($sql);
     if ( function_exists('bp_wire_install') )
         xprofile_wire_install();
     update_site_option( 'bp-xprofile-db-version', BP_XPROFILE_DB_VERSION );
+}
 …
+ *
  * Add the profile globals to the $bp global for use across the installation
+ *
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function xprofile_setup_globals() {
     global $bp, $wpdb;
     /* For internal identification */
     $bp->profile->id = 'profile';
     $bp->profile->table_name_groups = $wpdb->base_prefix . 'bp_xprofile_groups';
     $bp->profile->table_name_fields = $wpdb->base_prefix . 'bp_xprofile_fields';
 …
     /* Register this in the active components array */
     $bp->active_components[$bp->profile->slug] = $bp->profile->id;
     /* Set the support field type ids */
     $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) );
 …
     if ( function_exists( 'bp_wire_install' ) )
         $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire';
     do_action( 'xprofile_setup_globals' );
+}
 …
  * Creates the administration interface menus and checks to see if the DB
  * tables are set up.
+ *
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
  * @uses add_submenu_page() Adds a submenu tab to a top level tab in the admin area
  * @uses xprofile_install() Runs the DB table installation function
  * @return
+ * @return
  */
 function xprofile_add_admin_menu() {
     global $wpdb, $bp;
     if ( !is_site_admin() )
         return false;
     /* Add the administration tab under the "Site Admin" tab for site administrators */
     add_submenu_page( 'bp-general-settings', __("Profile Field Setup", 'buddypress'), __("Profile Field Setup", 'buddypress'), 'manage-options', 'bp-profile-setup', "xprofile_admin" );
 …
+ *
  * Sets up the navigation items for the xprofile component
+ *
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function xprofile_setup_nav() {
     global $bp;
     /* Add 'Profile' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __( 'Profile', 'buddypress' ), 'slug' => $bp->profile->slug, 'position' => 20, 'screen_function' => 'xprofile_screen_display_profile', 'default_subnav_slug' => 'public', 'item_css_id' => $bp->profile->id ) );
     $profile_link = $bp->loggedin_user->domain . $bp->profile->slug . '/';
     /* Add the subnav items to the profile */
     bp_core_new_subnav_item( array( 'name' => __( 'Public', 'buddypress' ), 'slug' => 'public', 'parent_url' => $profile_link, 'parent_slug' => $bp->profile->slug, 'screen_function' => 'xprofile_screen_display_profile', 'position' => 10 ) );
 …
         } else {
             $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
             $bp->bp_options_title = $bp->displayed_user->fullname;
+            $bp->bp_options_title = $bp->displayed_user->fullname;
+        }
+    }
     do_action( 'xprofile_setup_nav' );
+}
 …
+ *
  * Adds an admin bar menu to any profile page providing site admin options for that user.
+ *
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function xprofile_setup_adminbar_menu() {
     global $bp;
     if ( !$bp->displayed_user->id )
         return false;
     /* Don't show this menu to non site admins or if you're viewing your own profile */
     if ( !is_site_admin() || bp_is_home() )
 …
     <li id="bp-adminbar-adminoptions-menu">
         <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
         <ul>
             <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
             <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
             <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
                 <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
 …
                 <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
             <?php endif; ?>
             <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
             <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
         </ul>
 …
+ *
  * Handles the display of the profile page by loading the correct template file.
+ *
+ *
  * @package BuddyPress Xprofile
  * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
 …
     if ( isset($_GET['new']) )
         bp_core_delete_notifications_for_user_by_item_id( $bp->loggedin_user->id, $bp->displayed_user->id, 'friends', 'friendship_accepted' );
     do_action( 'xprofile_screen_display_profile', $_GET['new'] );
     bp_core_load_template( apply_filters( 'xprofile_template_display_profile', 'profile/index' ) );
 …
  * Handles the display of the profile edit page by loading the correct template file.
  * Also checks to make sure this can only be accessed for the logged in users profile.
+ *
+ *
  * @package BuddyPress Xprofile
  * @uses bp_is_home() Checks to make sure the current user being viewed equals the logged in user
 …
 function xprofile_screen_edit_profile() {
     global $bp;
     if ( !bp_is_home() && !is_site_admin() )
         return false;
     /* Check to see if any new information has been submitted */
     if ( isset($_POST['field_ids']) ) {
         /* Check the nonce */
         check_admin_referer( 'bp_xprofile_edit' );
         /* Check we have field ID's */
         if ( empty( $_POST['field_ids'] ) )
             bp_core_redirect( $bp->displayed_user->domain . BP_XPROFILE_SLUG . '/edit/group/' . $bp->action_variables[1] . '/' );
         /* Explode the posted field IDs into an array so we know which fields have been submitted */
         $posted_field_ids = explode( ',', $_POST['field_ids'] );
         /* Loop through the posted fields formatting any datebox values then validate the field */
+        foreach ( $posted_field_ids as $field_id ) {
+        foreach ( $posted_field_ids as $field_id ) {
             if ( !isset( $_POST['field_' . $field_id] ) ) {
                 if ( is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
                     /* Concatenate the values. */
                     $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .
+                    $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .
                                   $_POST['field_' . $field_id . '_month'] . ' ' .
                                   $_POST['field_' . $field_id . '_year'];
 …
         if ( $errors )
             bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
         else {
+            bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
+        else {
             /* Reset the errors var */
             $errors = false;
             /* Now we've checked for required fields, lets save the values. */
             foreach ( $posted_field_ids as $field_id ) {
+            foreach ( $posted_field_ids as $field_id ) {
                 if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id] ) )
                     $errors = true;
 …
                     do_action( 'xprofile_profile_field_data_updated', $field_id, $_POST['field_' . $field_id] );
+            }
             do_action( 'xprofile_updated_profile', $posted_field_ids, $errors );
             /* Set the feedback messages */
             if ( $errors )
                 bp_core_add_message( __( 'There was a problem updating some of your profile information, please try again.', 'buddypress' ), 'error' );
             else
+            else
                 bp_core_add_message( __( 'Changes saved.', 'buddypress' ) );
 …
     do_action( 'xprofile_screen_edit_profile' );
     bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'profile/edit' ) );
+    bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'profile/edit' ) );
+}
 …
+ *
  * Handles the uploading and cropping of a user avatar. Displays the change avatar page.
+ *
+ *
  * @package BuddyPress Xprofile
  * @uses bp_is_home() Checks to make sure the current user being viewed equals the logged in user
 …
 function xprofile_screen_change_avatar() {
     global $bp;
     if ( !bp_is_home() && !is_site_admin() )
         return false;
     $bp->avatar_admin->step = 'upload-image';
     if ( !empty( $_FILES ) ) {
         /* Check the nonce */
         check_admin_referer( 'bp_avatar_upload' );
         /* Pass the file to the avatar upload handler */
         if ( bp_core_avatar_handle_upload( $_FILES, 'xprofile_avatar_upload_dir' ) ) {
+        /* Pass the file to the avatar upload handler */
+        if ( bp_core_avatar_handle_upload( $_FILES, 'xprofile_avatar_upload_dir' ) ) {
             $bp->avatar_admin->step = 'crop-image';
 …
+        }
+    }
     /* If the image cropping is done, crop the image and save a full/thumb version */
     if ( isset( $_POST['avatar-crop-submit'] ) ) {
         /* Check the nonce */
         check_admin_referer( 'bp_avatar_cropstore' );
 …
     do_action( 'xprofile_screen_change_avatar' );
     bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'profile/change-avatar' ) );
+}
 …
  * Settings are hooked into the function: bp_core_screen_notification_settings_content()
  * in bp-core/bp-core-settings.php
+ *
+ *
  * @package BuddyPress Xprofile
  * @global $current_user WordPress global variable containing current logged in user information
  */
 function xprofile_screen_notification_settings() {
+function xprofile_screen_notification_settings() {
     global $current_user; ?>
     <?php if ( function_exists('bp_wire_install') ) { ?>
 …
             <td class="no"><input type="radio" name="notifications[notification_profile_wire_post]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_profile_wire_post' ) ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
         <?php do_action( 'xprofile_screen_notification_settings' ) ?>
     </table>
     <?php } ?>
 <?php
+<?php
+}
 add_action( 'bp_notification_settings', 'xprofile_screen_notification_settings', 1 );
 …
+ *
  * The function will delete the active avatar for a user.
+ *
+ *
  * @package BuddyPress Xprofile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
     if ( $bp->profile->slug != $bp->current_component || 'change-avatar' != $bp->current_action || 'delete-avatar' != $bp->action_variables[0] )
         return false;
     /* Check the nonce */
     check_admin_referer( 'bp_delete_avatar_link' );
     if ( !bp_is_home() && !is_site_admin() )
         return false;
     if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->displayed_user->id ) ) )
         bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
 …
         bp_core_add_message( __( 'There was a problem deleting that avatar, please try again.', 'buddypress' ), 'error' );
     bp_core_redirect( wp_get_referer() );
+    bp_core_redirect( wp_get_referer() );
+}
 add_action( 'wp', 'xprofile_action_delete_avatar', 3 );
 …
  * xprofile_action_new_wire_post()
+ *
  * Posts a new wire post to the users profile wire.
+ *
+ * Posts a new wire post to the users profile wire.
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
     if ( $bp->current_component != $bp->wire->slug )
         return false;
     if ( 'post' != $bp->current_action )
         return false;
     /* Check the nonce */
     if ( !check_admin_referer( 'bp_wire_post' ) )
         return false;
+    if ( !check_admin_referer( 'bp_wire_post' ) )
+        return false;
     if ( !$wire_post = bp_wire_new_post( $bp->displayed_user->id, $_POST['wire-post-textarea'], $bp->profile->slug, false, $bp->profile->table_name_wire ) ) {
         bp_core_add_message( __( 'Wire message could not be posted. Please try again.', 'buddypress' ), 'error' );
     } else {
         bp_core_add_message( __( 'Wire message successfully posted.', 'buddypress' ) );
         /* Record the notification for the reciever if it's not on their own wire */
         if ( !bp_is_home() )
             bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' );
+            bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' );
         /* Record this on the poster's activity screen */
         if ( ( $wire_post->item_id == $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id == $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) {
             $from_user_link = bp_core_get_userlink($wire_post->user_id);
             $content = sprintf( __('%s wrote on their own wire', 'buddypress'), $from_user_link ) . ': <span class="time-since">%s</span>';
             $primary_link = bp_core_get_userlink( $wire_post->user_id, false, true );
+            $content = sprintf( __('%s wrote on their own wire', 'buddypress'), $from_user_link ) . ': <span class="time-since">%s</span>';
+            $primary_link = bp_core_get_userlink( $wire_post->user_id, false, true );
         } else if ( ( $wire_post->item_id != $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id != $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) {
             $from_user_link = bp_core_get_userlink($wire_post->user_id);
             $to_user_link = bp_core_get_userlink( $wire_post->item_id, false, false, true, true );
             $content = sprintf( __('%s wrote on %s wire', 'buddypress'), $from_user_link, $to_user_link ) . ': <span class="time-since">%s</span>';
+            $content = sprintf( __('%s wrote on %s wire', 'buddypress'), $from_user_link, $to_user_link ) . ': <span class="time-since">%s</span>';
             $primary_link = bp_core_get_userlink( $wire_post->item_id, false, true );
+        }
+        }
         $content .= '<blockquote>' . bp_create_excerpt($wire_post->content) . '</blockquote>';
 …
         ) );
         do_action( 'xprofile_new_wire_post', &$wire_post );
+        do_action( 'xprofile_new_wire_post', &$wire_post );
+    }
 …
  * xprofile_action_delete_wire_post()
+ *
  * Deletes a wire post from the users profile wire.
+ *
+ * Deletes a wire post from the users profile wire.
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
 …
 function xprofile_action_delete_wire_post() {
     global $bp;
     if ( $bp->current_component != $bp->wire->slug )
         return false;
     if ( $bp->current_action != 'delete' )
         return false;
     if ( !check_admin_referer( 'bp_wire_delete_link' ) )
         return false;
     $wire_post_id = $bp->action_variables[0];
 …
         /* Delete the post from activity streams */
         xprofile_delete_activity( array( 'item_id' => $wire_post_id, 'component_action' => 'new_wire_post' ) );
         do_action( 'xprofile_delete_wire_post', $wire_post_id );
+        do_action( 'xprofile_delete_wire_post', $wire_post_id );
     } else {
         bp_core_add_message( __('Wire post could not be deleted, please try again.', 'buddypress'), 'error' );
+    }
     if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) {
         bp_core_redirect( $bp->displayed_user->domain );
 …
 function xprofile_register_activity_actions() {
     global $bp;
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
 …
  * Records activity for the logged in user within the profile component so that
  * it will show in the users activity stream (if installed)
+ *
+ *
  * @package BuddyPress XProfile
  * @param $args Array containing all variables used after extract() call
 …
 function xprofile_record_activity( $args = true ) {
     global $bp;
     if ( !function_exists( 'bp_activity_add' ) )
         return false;
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
+    extract( $r, EXTR_SKIP );
     return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+}
 …
  * Deletes activity for a user within the profile component so that
  * it will be removed from the users activity stream and sitewide stream (if installed)
+ *
+ *
  * @package BuddyPress XProfile
  * @param $args Array containing all variables used after extract() call
 …
 function xprofile_delete_activity( $args = '' ) {
     global $bp;
     if ( function_exists('bp_activity_delete_by_item_id') ) {
         extract($args);
 …
 function xprofile_register_activity_action( $key, $value ) {
     global $bp;
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
     return apply_filters( 'xprofile_register_activity_action', bp_activity_set_action( $bp->profile->id, $key, $value ), $key, $value );
+}
 …
+ *
  * Format notifications into something that can be read and displayed
+ *
+ *
  * @package BuddyPress Xprofile
  * @param $item_id The ID of the specific item for which the activity is recorded (could be a wire post id, user id etc)
 …
     if ( 'new_wire_post' == $action ) {
         if ( (int)$total_items > 1 ) {
             return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="' . __( 'Wire', 'buddypress' ) . '">' . sprintf( __( 'You have %d new posts on your wire', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+            return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="' . __( 'Wire', 'buddypress' ) . '">' . sprintf( __( 'You have %d new posts on your wire', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
         } else {
             $user_fullname = bp_core_get_user_displayname( $item_id );
 …
+        }
+    }
     do_action( 'xprofile_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
     return false;
+}
 …
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
+    extract( $r, EXTR_SKIP );
     if ( !$name )
         return false;
     $field_group = new BP_XProfile_Group( $field_group_id );
     $field_group->name = $name;
     $field_group->description = $description;
     $field_group->can_delete = $can_delete;
     return $field_group->save();
+}
 …
 function xprofile_insert_field( $args = '' ) {
     global $bp;
     extract( $args );
     /**
      * Possible parameters (pass as assoc array):
 …
      *  'option_order'
      */
     /* Check we have the minimum details */
     if ( !$field_group_id )
         return false;
     /* Check this is a valid field type */
     if ( !in_array( $type, (array) $bp->profile->field_types ) )
         return false;
     /* Instantiate a new field object */
     if ( $field_id )
 …
     $field->group_id = $field_group_id;
     if ( !empty( $parent_id ) )
         $field->parent_id = $parent_id;
     if ( !empty( $type ) )
         $field->type = $type;
     if ( !empty( $name ) )
         $field->name = $name;
 …
     if ( !empty( $description ) )
         $field->description = $description;
     if ( !empty( $is_required ) )
         $field->is_required = $is_required;
     if ( !empty( $can_delete ) )
         $field->can_delete = $can_delete;
     if ( !empty( $field_order ) )
         $field->field_order = $field_order;
     if ( !empty( $order_by ) )
         $field->order_by = $order_by;
     if ( !empty( $is_default_option ) )
         $field->is_default_option = $is_default_option;
     if ( !empty( $option_order ) )
         $field->option_order = $option_order;
     if ( !$field->save() )
         return false;
 …
+ *
  * Fetches profile data for a specific field for the user.
+ *
+ *
  * @package BuddyPress Core
  * @param $field The ID of the field, or the $name of the field.
 …
 function xprofile_get_field_data( $field, $user_id = null ) {
     global $bp;
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     if ( !$user_id )
         return false;
 …
+ *
  * A simple function to set profile data for a specific field for a specific user.
+ *
+ *
  * @package BuddyPress Core
  * @param $field The ID of the field, or the $name of the field.
 …
     else
         $field_id = xprofile_get_field_id_from_name( $field );
     if ( !$field_id )
         return false;
     $field = new BP_XProfile_ProfileData();
     $field->field_id = $field_id;
     $field->user_id = $user_id;
     $field->value = maybe_serialize( $value );
     return $field->save();
+}
 …
     else
         $field_id = xprofile_get_field_id_from_name( $field );
     if ( !$field_id )
         return false;
     $field = new BP_XProfile_ProfileData( $field_id );
     return $field->delete();
 …
 function xprofile_check_is_required_field( $field_id ) {
     $field = new BP_Xprofile_Field( $field_id );
     if ( (int)$field->is_required )
         return true;
     return false;
+}
 …
+ *
  * Returns the ID for the field based on the field name.
+ *
+ *
  * @package BuddyPress Core
  * @param $field_name The name of the field to get the ID for.
 …
+ *
  * Fetches a random piece of profile data for the user.
+ *
+ *
  * @package BuddyPress Core
  * @param $user_id User ID of the user to get random data for
 …
     $field_data = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
     $field_data[0]->value = xprofile_format_profile_field( $field_data[0]->type, $field_data[0]->value );
     if ( !$field_data[0]->value || empty( $field_data[0]->value ) )
         return false;
     return apply_filters( 'xprofile_get_random_profile_data', $field_data );
+}
 …
+ *
  * Formats a profile field according to its type. [ TODO: Should really be moved to filters ]
+ *
+ *
  * @package BuddyPress Core
  * @param $field_type The type of field: datebox, selectbox, textbox etc
 …
     if ( !isset($field_value) || empty( $field_value ) )
         return false;
     $field_value = bp_unserialize_profile_field( $field_value );
     if ( 'datebox' == $field_type ) {
         $field_value = bp_format_time( $field_value, true );
 …
         $field_value = str_replace(']]>', ']]&gt;', $content);
+    }
     return stripslashes( stripslashes( $field_value ) );
+}
 …
+ *
  * Setup the avatar upload directory for a user.
+ *
+ *
  * @package BuddyPress Core
  * @param $directory The root directory name
 …
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
     if ( !$directory )
         $directory = 'avatars';
 …
     $newbdir = $newdir;
     if ( !file_exists( $newdir ) )
         @wp_mkdir_p( $newdir );
 …
+ *
  * Syncs Xprofile data to the standard built in WordPress profile data.
+ *
+ *
  * @package BuddyPress Core
  */
 function xprofile_sync_wp_profile() {
     global $bp, $wpdb;
     if ( (int)get_site_option( 'bp-disable-profile-sync' ) )
         return true;
     $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $bp->loggedin_user->id );
     $space = strpos( $fullname, ' ' );
     if ( false === $space ) {
         $firstname = $fullname;
 …
     } else {
         $firstname = substr( $fullname, 0, $space );
         $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );
+    }
+        $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );
+    }
     update_usermeta( $bp->loggedin_user->id, 'nickname', $fullname );
     update_usermeta( $bp->loggedin_user->id, 'first_name', $firstname );
 …
  * Removes notifications from the notification menu when a user clicks on them and
  * is taken to a specific screen.
+ *
+ *
  * @package BuddyPress Core
  */
 function xprofile_remove_screen_notifications() {
     global $bp;
     bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_wire_post' );
+}
 …
  * profile data from each table. Also we need to clean anything up in the usermeta table
  * that this component uses.
+ *
+ *
  * @package BuddyPress XProfile
  * @param $user_id The ID of the deleted user
 …
 function xprofile_remove_data( $user_id ) {
     BP_XProfile_ProfileData::delete_data_for_user( $user_id );
     // delete any avatar files.
     @unlink( get_usermeta( $user_id, 'bp_core_avatar_v1_path' ) );
     @unlink( get_usermeta( $user_id, 'bp_core_avatar_v2_path' ) );
     // unset the usermeta for avatars from the usermeta table.
     delete_usermeta( $user_id, 'bp_core_avatar_v1' );
 …
 function xprofile_clear_profile_data_object_cache( $group_id ) {
     global $bp;
+    global $bp;
     wp_cache_delete( 'xprofile_fields_' . $group_id . '_' . $bp->loggedin_user->id, 'bp' );
     wp_cache_delete( 'bp_user_fullname_' . $bp->loggedin_user->id, 'bp' );

trunk/bp-xprofile/bp-xprofile-admin.php

-                      r2066
+                      r2077
 /**************************************************************************
  xprofile_admin()
  Handles all actions for the admin area for creating, editing and deleting
  profile groups and fields.
 …
         xprofile_admin_manage_group($_GET['group_id']);
     } else {
 ?>
+?>
     <div class="wrap">
         <h2><?php _e( 'Profile Field Setup', 'buddypress') ?></h2>
         <br />
         <p><?php _e( 'Your users will distinguish themselves through their profile page.
            You must give them profile fields that allow them to describe themselves
+        <p><?php _e( 'Your users will distinguish themselves through their profile page.
+           You must give them profile fields that allow them to describe themselves
             in a way that is relevant to the theme of your social network.', 'buddypress') ?></p>
         <p><?php _e('NOTE: Any fields in the first group will appear on the signup page.', 'buddypress'); ?></p>
         <form action="" id="profile-field-form" method="post">
             <?php wp_nonce_field( 'bp_reorder_fields', '_wpnonce_reorder_fields' ); ?>
             <?php
                 if ( $message != '' ) {
 …
                 </div>
             <?php }
             if ( $groups ) { ?>
                 <?php
+                <?php
                 for ( $i = 0; $i < count($groups); $i++ ) { // TODO: foreach
                 ?>
 …
                                 <th scope="col">&nbsp;</th>
                                 <th scope="col" colspan="<?php if ( $groups[$i]->can_delete ) { ?>3<?php } else { ?>5<?php } ?>"><?php echo attribute_escape( $groups[$i]->name ); ?></th>
                                 <?php if ( $groups[$i]->can_delete ) { ?>
+                                <?php if ( $groups[$i]->can_delete ) { ?>
                                     <th scope="col"><a class="edit" href="admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=<?php echo attribute_escape( $groups[$i]->id ); ?>"><?php _e( 'Edit', 'buddypress' ) ?></a></th>
                                     <th scope="col"><a class="delete" href="admin.php?page=bp-profile-setup&amp;mode=delete_group&amp;group_id=<?php echo attribute_escape( $groups[$i]->id ); ?>"><?php _e( 'Delete', 'buddypress' ) ?></a></th>
 …
                         </thead>
                         <tbody id="the-list">
                           <?php if ( $groups[$i]->fields ) { ?>
                                 <?php for ( $j = 0; $j < count($groups[$i]->fields); $j++ ) { ?>
                                     <?php if ( 0 == $j % 2 ) { $class = ""; } else { $class = "alternate"; } ?>
+                                    <?php if ( 0 == $j % 2 ) { $class = ""; } else { $class = "alternate"; } ?>
                                     <?php $field = new BP_XProfile_Field($groups[$i]->fields[$j]->id); ?>
                                     <?php if ( !$field->can_delete ) { $class .= ' core'; } ?>
                                     <tr id="field_<?php echo attribute_escape( $field->id ); ?>" class="sortable<?php if ( $class ) { echo ' ' . $class; } ?>">
                                         <td width="10"><img src="<?php echo BP_PLUGIN_URL ?>/bp-xprofile/admin/images/move.gif" alt="<?php _e( 'Drag', 'buddypress' ) ?>" /></td>
 …
                                         <td style="text-align:center;"><?php if ( !$field->can_delete ) { ?><strike><?php _e( 'Delete', 'buddypress' ) ?></strike><?php } else { ?><a class="delete" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo attribute_escape( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ) ?></a><?php } ?></td>
                                     </tr>
                                 <?php } ?>
                             <?php } else { ?>
                                 <tr class="nodrag">
                                     <td colspan="6"><?php _e( 'There are no fields in this group.', 'buddypress' ) ?></td>
                                 </tr>
                             <?php } ?>
                         </tbody>
                         <tfoot>
                                 <tr class="nodrag">
                                     <td colspan="6"><a href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo attribute_escape( $groups[$i]->id ); ?>&amp;mode=add_field"><?php _e( 'Add New Field', 'buddypress' ) ?></a></td>
                                 </tr>
                         </tfoot>
                     </table>
                     </p>
                 <?php } /* End For */ ?>
                     <p>
                         <a class="button" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ) ?></a>
                     </p>
             <?php } else { ?>
                 <div id="message" class="error"><p><?php _e('You have no groups.', 'buddypress' ); ?></p></div>
                 <p><a href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ) ?></a></p>
             <?php } ?>
         </form>
     </div>
 <?php
 …
 /**************************************************************************
  xprofile_admin_manage_group()
  Handles the adding or editing of groups.
  **************************************************************************/
 …
             $group->name = wp_filter_kses( $_POST['group_name'] );
             $group->description = wp_filter_kses( $_POST['group_desc'] );
             if ( !$group->save() ) {
                 $message = __('There was an error saving the group. Please try again', 'buddypress');
 …
                 $message = __('The group was saved successfully.', 'buddypress');
                 $type = 'success';
                 do_action( 'xprofile_groups_saved_group', $group );
+            }
             unset($_GET['mode']);
             xprofile_admin( $message, $type );
 …
+        }
     } else {
         $group->render_admin_form();
+        $group->render_admin_form();
+    }
+}
 …
 /**************************************************************************
  xprofile_admin_delete_group()
  Handles the deletion of profile data groups.
  **************************************************************************/
 …
 function xprofile_admin_delete_group( $group_id ) {
     global $message, $type;
     $group = new BP_XProfile_Group($group_id);
     if ( !$group->delete() ) {
         $message = __('There was an error deleting the group. Please try again', 'buddypress');
 …
         $message = __('The group was deleted successfully.', 'buddypress');
         $type = 'success';
         do_action( 'xprofile_groups_deleted_group', $group );
+    }
     unset($_GET['mode']); // TODO: wtf?
     xprofile_admin( $message, $type );
 …
 /**************************************************************************
  xprofile_admin_manage_field()
  Handles the adding or editing of profile field data for a user.
  **************************************************************************/
 …
 function xprofile_admin_manage_field( $group_id, $field_id = null ) {
     global $bp, $wpdb, $message, $groups;
     $field = new BP_XProfile_Field($field_id);
     $field->group_id = $group_id;
 …
                 $field->field_order++;
+            }
             if ( !$field->save() ) {
                 $message = __('There was an error saving the field. Please try again', 'buddypress');
                 $type = 'error';
                 unset($_GET['mode']);
                 xprofile_admin($message, $type);
 …
                 $message = __('The field was saved successfully.', 'buddypress');
                 $type = 'success';
                 unset($_GET['mode']);
                 do_action( 'xprofile_fields_saved_field', $field );
                 $groups = BP_XProfile_Group::get_all();
                 xprofile_admin( $message, $type );
 …
+        }
     } else {
         $field->render_admin_form();
+        $field->render_admin_form();
+    }
+}
 …
 /**************************************************************************
  xprofile_admin_delete_field()
  Handles the deletion of a profile field [or option].
 **************************************************************************/
 …
 function xprofile_admin_delete_field( $field_id, $type = 'field' ) {
     global $message, $type;
     if ( 'field' == $type ) {
         $type = __('field', 'buddypress');
 …
         $type = __('option', 'buddypress');
+    }
     $field = new BP_XProfile_Field($field_id);
 …
         $message = sprintf( __('The %s was deleted successfully!', 'buddypress'), $type);
         $type = 'success';
         do_action( 'xprofile_fields_deleted_field', $field );
+    }
     unset($_GET['mode']);
     xprofile_admin($message, $type);
 …
 function xprofile_ajax_reorder_fields() {
     global $bp;
     /* Check the nonce */
     check_admin_referer( 'bp_reorder_fields', '_wpnonce_reorder_fields' );
     if ( empty( $_POST['field_order'] ) )
         return false;
     parse_str($_POST['field_order'], $order );

trunk/bp-xprofile/bp-xprofile-classes.php

-                      r2066
+                      r2077
     var $can_delete;
     var $fields;
     function bp_xprofile_group( $id = null ) {
         global $bp, $wpdb;
 …
+        }
+    }
     function populate( $id ) {
         global $wpdb, $bp;
         $sql = $wpdb->prepare("SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id);
 …
             $this->description = $group->description;
             $this->can_delete = $group->can_delete;
             // get the fields for this group.
             $this->fields = $this->get_fields();
 …
     function save() {
         global $wpdb, $bp;
         $this->name = apply_filters( 'xprofile_group_name_before_save', $this->name, $this->id );
         $this->description = apply_filters( 'xprofile_group_description_before_save', $this->description, $this->id );
 …
             $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s, description = %s WHERE id = %d", $this->name, $this->description, $this->id );
         } else {
             $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_groups} (name, description, can_delete) VALUES (%s, %s, 1)", $this->name, $this->description );
+        }
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_groups} (name, description, can_delete) VALUES (%s, %s, 1)", $this->name, $this->description );
+        }
         if ( !$wpdb->query($sql) )
             return false;
         do_action( 'xprofile_group_after_save', $this );
         return true;
+    }
     function delete() {
         global $wpdb, $bp;
         if ( !$this->can_delete )
             return false;
         $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id );
 …
             if ( BP_XProfile_Field::delete_for_group($this->id) ) {
                 // Now delete all the profile data for the groups fields
                 for ( $i = 0; $i < count($this->fields); $i++ ) {
+                for ( $i = 0; $i < count($this->fields); $i++ ) {
                     BP_XProfile_ProfileData::delete_for_field($this->fields[$i]->id);
+                }
+            }
             return true;
+        }
+    }
     function get_fields() {
         global $wpdb, $bp;
         /* Find the max value for field_order, if it is zero, order by field_id instead -- provides backwards compat ordering */
         if ( !(int) $wpdb->get_var( $wpdb->prepare( "SELECT MAX(field_order) FROM {$bp->profile->table_name_fields} WHERE group_id = %d", $this->id ) ) )
 …
         if ( !$fields = $wpdb->get_results( $wpdb->prepare("SELECT id, type FROM {$bp->profile->table_name_fields} WHERE group_id = %d AND parent_id = 0 {$order_sql}", $this->id ) ) )
             return false;
         return $fields;
+    }
     /** Static Functions **/
     function get_all( $hide_empty = false ) {
         global $wpdb, $bp;
 …
         if ( !$groups_temp = $wpdb->get_results($sql) )
             return false;
         for ( $i = 0; $i < count($groups_temp); $i++ ) {
             $group = new BP_XProfile_Group($groups_temp[$i]->id);
 …
         return $groups;
+    }

Context Navigation

Legend: