Changeset 1021

Timestamp:

02/06/2009 03:07:48 AM (16 years ago)

Author:

apeatling

Message:

Converted $bp as an array to $bp as an object. See this post for more info: http://buddypress.org/forums/topic.php?id=1125

Location:

trunk

Files:

• bp-activity.php (modified) (14 diffs)
• bp-activity/bp-activity-classes.php (modified) (20 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (6 diffs)
• bp-activity/bp-activity-widgets.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-friends-feed.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-personal-feed.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-sitewide-feed.php (modified) (1 diff)
• bp-blogs.php (modified) (17 diffs)
• bp-blogs/bp-blogs-ajax.php (modified) (2 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (6 diffs)
• bp-blogs/directories/bp-blogs-directory-blogs.php (modified) (4 diffs)
• bp-core.php (modified) (34 diffs)
• bp-core/bp-core-admin.php (modified) (1 diff)
• bp-core/bp-core-adminbar.php (modified) (10 diffs)
• bp-core/bp-core-ajax.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (5 diffs)
• bp-core/bp-core-catchuri.php (modified) (9 diffs)
• bp-core/bp-core-classes.php (modified) (12 diffs)
• bp-core/bp-core-notifications.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (6 diffs)
• bp-core/bp-core-templatetags.php (modified) (30 diffs)
• bp-core/bp-core-widgets.php (modified) (1 diff)
• bp-core/directories/bp-core-directory-members.php (modified) (2 diffs)
• bp-forums.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (3 diffs)
• bp-friends.php (modified) (11 diffs)
• bp-friends/bp-friends-ajax.php (modified) (1 diff)
• bp-friends/bp-friends-classes.php (modified) (20 diffs)
• bp-friends/bp-friends-cssjs.php (modified) (1 diff)
• bp-friends/bp-friends-templatetags.php (modified) (11 diffs)
• bp-groups.php (modified) (80 diffs)
• bp-groups/bp-groups-ajax.php (modified) (6 diffs)
• bp-groups/bp-groups-classes.php (modified) (46 diffs)
• bp-groups/bp-groups-cssjs.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (4 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (34 diffs)
• bp-groups/bp-groups-widgets.php (modified) (1 diff)
• bp-groups/directories/bp-groups-directory-groups.php (modified) (3 diffs)
• bp-messages.php (modified) (28 diffs)
• bp-messages/autocomplete/bp-messages-autocomplete.php (modified) (1 diff)
• bp-messages/bp-messages-ajax.php (modified) (1 diff)
• bp-messages/bp-messages-classes.php (modified) (35 diffs)
• bp-messages/bp-messages-cssjs.php (modified) (2 diffs)
• bp-messages/bp-messages-templatetags.php (modified) (9 diffs)
• bp-wire.php (modified) (5 diffs)
• bp-wire/bp-wire-ajax.php (modified) (1 diff)
• bp-wire/bp-wire-classes.php (modified) (5 diffs)
• bp-wire/bp-wire-templatetags.php (modified) (9 diffs)
• bp-xprofile.php (modified) (26 diffs)
• bp-xprofile/bp-xprofile-admin.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (33 diffs)
• bp-xprofile/bp-xprofile-cssjs.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-filters.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-notifications.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-signup.php (modified) (3 diffs)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (8 diffs)
• buddypress-theme/buddypress-home/functions.php (modified) (3 diffs)
• buddypress-theme/member-themes/buddypress-member/functions.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -27 +27 @@
     global $wpdb, $bp;
     
-    if ( !$bp['current_userid'] )
+    if ( !$bp->displayed_user->id )
         return false;
     
@@ -33 +33 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     
-    $sql[] = "CREATE TABLE ". $bp['activity']['table_name_current_user'] ." (
+    $sql[] = "CREATE TABLE ". $bp->activity->table_name_current_user ." (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 item_id int(11) NOT NULL,
@@ -49 +49 @@
                ) {$charset_collate};";
 
-    $sql[] = "CREATE TABLE ". $bp['activity']['table_name_current_user_cached'] ." (
+    $sql[] = "CREATE TABLE ". $bp->activity->table_name_current_user_cached ." (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 item_id int(11) NOT NULL,
@@ -67 +67 @@
                ) {$charset_collate};";
     
-    $sql[] = "CREATE TABLE ". $bp['activity']['table_name_current_user_friends_cached'] ." (
+    $sql[] = "CREATE TABLE ". $bp->activity->table_name_current_user_friends_cached ." (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id int(11) NOT NULL,
@@ -85 +85 @@
     dbDelta($sql);
     
-    update_usermeta( $bp['current_userid'], 'bp-activity-db-version', BP_ACTIVITY_DB_VERSION );
+    update_usermeta( $bp->displayed_user->id, 'bp-activity-db-version', BP_ACTIVITY_DB_VERSION );
 }
 
@@ -94 +94 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     
-    $sql[] = "CREATE TABLE ". $bp['activity']['table_name_sitewide'] ." (
+    $sql[] = "CREATE TABLE ". $bp->activity->table_name_sitewide ." (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id int(11) NOT NULL,
@@ -117 +117 @@
     // dbDelta won't change character sets, so we need to do this seperately.
     // This will only be in here pre v1.0
-    $wpdb->query( $wpdb->prepare( "ALTER TABLE " . $bp['activity']['table_name_sitewide'] . " DEFAULT CHARACTER SET %s", $wpdb->charset ) );
+    $wpdb->query( $wpdb->prepare( "ALTER TABLE " . $bp->activity->table_name_sitewide . " DEFAULT CHARACTER SET %s", $wpdb->charset ) );
 
     update_site_option( 'bp-activity-db-version', BP_ACTIVITY_DB_VERSION );
@@ -132 +132 @@
     global $bp, $wpdb, $current_blog;
 
-    $bp['activity'] = array(
-        'table_name_loggedin_user' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_activity',
-        'table_name_loggedin_user_cached' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_activity_cached',
-        
-        'table_name_current_user' => $wpdb->base_prefix . 'user_' . $bp['current_userid'] . '_activity',
-        'table_name_current_user_cached' => $wpdb->base_prefix . 'user_' . $bp['current_userid'] . '_activity_cached',
-        
-        'table_name_loggedin_user_friends_cached' => $wpdb->base_prefix . 'user_' . $bp['loggedin_userid'] . '_friends_activity_cached',
-        'table_name_current_user_friends_cached' => $wpdb->base_prefix . 'user_' . $bp['current_userid'] . '_friends_activity_cached',
-        
-        'table_name_sitewide' => $wpdb->base_prefix . 'bp_activity_sitewide',
-        
-        'image_base' => site_url( MUPLUGINDIR . '/bp-activity/images' ),
-        'slug'       => BP_ACTIVITY_SLUG
-    );
-    
-    $bp['version_numbers'][$bp['activity']['slug']] = BP_ACTIVITY_VERSION;
-
-    if ( $bp['current_userid'] ) {
+    $bp->activity->table_name_loggedin_user = $wpdb->base_prefix . 'user_' . $bp->loggedin_user->id . '_activity';
+    $bp->activity->table_name_loggedin_user_cached = $wpdb->base_prefix . 'user_' . $bp->loggedin_user->id . '_activity_cached';
+    
+    $bp->activity->table_name_current_user = $wpdb->base_prefix . 'user_' . $bp->displayed_user->id . '_activity';
+    $bp->activity->table_name_current_user_cached = $wpdb->base_prefix . 'user_' . $bp->displayed_user->id . '_activity_cached';
+    
+    $bp->activity->table_name_loggedin_user_friends_cached = $wpdb->base_prefix . 'user_' . $bp->loggedin_user->id . '_friends_activity_cached';
+    $bp->activity->table_name_current_user_friends_cached = $wpdb->base_prefix . 'user_' . $bp->displayed_user->id . '_friends_activity_cached';
+    
+    $bp->activity->table_name_sitewide = $wpdb->base_prefix . 'bp_activity_sitewide';
+    
+    $bp->activity->image_base = site_url( MUPLUGINDIR . '/bp-activity/images' );
+    $bp->activity->slug = BP_ACTIVITY_SLUG;
+    
+    $bp->version_numbers->activity = BP_ACTIVITY_VERSION;
+
+    if ( $bp->displayed_user->id ) {
         /* Check to see if the current user has their activity table set up. If not, set them up. */
-        if ( !$wpdb->get_var("SHOW TABLES LIKE '%" . $bp['activity']['table_name_current_user'] . "%'") || get_usermeta( $bp['current_userid'], 'bp-activity-db-version' ) < BP_ACTIVITY_VERSION  )
+        if ( !$wpdb->get_var("SHOW TABLES LIKE '%" . $bp->activity->table_name_current_user . "%'") || get_usermeta( $bp->displayed_user->id, 'bp-activity-db-version' ) < BP_ACTIVITY_VERSION  )
             bp_activity_user_install();
     }
@@ -158 +156 @@
     if ( is_site_admin() && $current_blog->blog_id == 1 ) {
         /* Check to see if the site wide activity table is set up. */
-        if ( !$wpdb->get_var("SHOW TABLES LIKE '%" . $bp['activity']['table_name_sitewide'] . "%'") || get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_VERSION  )
+        if ( !$wpdb->get_var("SHOW TABLES LIKE '%" . $bp->activity->table_name_sitewide . "%'") || get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_VERSION  )
             bp_activity_sitewide_install();
     }
@@ -176 +174 @@
     
     /* Add 'Activity' to the main navigation */
-    bp_core_add_nav_item( __('Activity', 'buddypress'), $bp['activity']['slug'] );
-    bp_core_add_nav_default( $bp['activity']['slug'], 'bp_activity_screen_my_activity', 'just-me' );
+    bp_core_add_nav_item( __('Activity', 'buddypress'), $bp->activity->slug );
+    bp_core_add_nav_default( $bp->activity->slug, 'bp_activity_screen_my_activity', 'just-me' );
         
-    $activity_link = $bp['loggedin_domain'] . $bp['activity']['slug'] . '/';
+    $activity_link = $bp->loggedin_user->domain . $bp->activity->slug . '/';
     
     /* Add the subnav items to the activity nav item */
-    bp_core_add_subnav_item( $bp['activity']['slug'], 'just-me', __('Just Me', 'buddypress'), $activity_link, 'bp_activity_screen_my_activity' );
-    bp_core_add_subnav_item( $bp['activity']['slug'], 'my-friends', __('My Friends', 'buddypress'), $activity_link, 'bp_activity_screen_friends_activity', 'activity-my-friends', bp_is_home() );
-    
-    if ( $bp['current_component'] == $bp['activity']['slug'] ) {
+    bp_core_add_subnav_item( $bp->activity->slug, 'just-me', __('Just Me', 'buddypress'), $activity_link, 'bp_activity_screen_my_activity' );
+    bp_core_add_subnav_item( $bp->activity->slug, 'my-friends', __('My Friends', 'buddypress'), $activity_link, 'bp_activity_screen_friends_activity', 'activity-my-friends', bp_is_home() );
+    
+    if ( $bp->current_component == $bp->activity->slug ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Activity', 'buddypress');
+            $bp->bp_options_title = __( 'My Activity', 'buddypress' );
         } else {
-            $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
-            $bp['bp_options_title'] = $bp['current_fullname']; 
+            $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+            $bp->bp_options_title = $bp->displayed_user->fullname; 
         }
     }
@@ -215 +213 @@
     
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
 
     $recorded_time = time();
@@ -255 +253 @@
     global $bp;
 
-    if ( $bp['current_component'] != $bp['activity']['slug'] || $bp['current_action'] != 'feed' || $bp['current_userid'] )
+    if ( $bp->current_component != $bp->activity->slug || $bp->current_action != 'feed' || $bp->displayed_user->id )
         return false;
 
@@ -266 +264 @@
     global $bp; 
 
-    if ( $bp['current_component'] != $bp['activity']['slug'] || !$bp['current_userid'] || $bp['current_action'] != 'feed' )
+    if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'feed' )
         return false;
 
@@ -277 +275 @@
     global $bp;
 
-    if ( $bp['current_component'] != $bp['activity']['slug'] || !$bp['current_userid'] || $bp['current_action'] != 'my-friends' || $bp['action_variables'][0] != 'feed' )
+    if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'my-friends' || $bp->action_variables[0] != 'feed' )
         return false;
     

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

@@ -31 +31 @@
         global $wpdb, $bp;
         
-        $activity = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $this->table_name . " WHERE id = %d", $this->id ) );
+        $activity = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$this->table_name} WHERE id = %d", $this->id ) );
 
         $this->item_id = $activity->item_id;
@@ -55 +55 @@
         if ( !$this->exists() ) {
             // Insert the new activity into the activity table.
-            $activity = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $this->table_name . " ( item_id, secondary_item_id, user_id, component_name, component_action, date_recorded, is_private, no_sitewide_cache ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_recorded, $this->is_private, $this->no_sitewide_cache ) );
+            $activity = $wpdb->query( $wpdb->prepare( "INSERT INTO {$this->table_name} ( item_id, secondary_item_id, user_id, component_name, component_action, date_recorded, is_private, no_sitewide_cache ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_recorded, $this->is_private, $this->no_sitewide_cache ) );
 
             // Fetch the formatted activity content so we can add it to the cache.
-            if ( function_exists( $bp[$this->component_name]['format_activity_function'] ) ) {
-                if ( !$activity_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 ) )
+            if ( function_exists( $bp->{$this->component_name}->format_activity_function ) ) {
+                if ( !$activity_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;
             }
             
             // Add the cached version of the activity to the cached activity table.
-            $activity_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $this->table_name_cached . " ( item_id, secondary_item_id, content, primary_link, component_name, component_action, date_cached, date_recorded, is_private ) VALUES ( %d, %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $activity_content['content'], $activity_content['primary_link'], $this->component_name, $this->component_action, time(), $this->date_recorded, $this->is_private ) );
+            $activity_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO {$this->table_name_cached} ( item_id, secondary_item_id, content, primary_link, component_name, component_action, date_cached, date_recorded, is_private ) VALUES ( %d, %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $activity_content['content'], $activity_content['primary_link'], $this->component_name, $this->component_action, time(), $this->date_recorded, $this->is_private ) );
             
             // Add the cached version of the activity to the sitewide activity table.
             if ( !$this->no_sitewide_cache )
-                $sitewide_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, item_id, secondary_item_id, content, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %d, %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d) )", $this->user_id, $this->item_id, $this->secondary_item_id, $activity_content['content'], $activity_content['primary_link'], $this->component_name, $this->component_action, time(), $this->date_recorded ) );
+                $sitewide_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->activity->table_name_sitewide} ( user_id, item_id, secondary_item_id, content, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %d, %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d) )", $this->user_id, $this->item_id, $this->secondary_item_id, $activity_content['content'], $activity_content['primary_link'], $this->component_name, $this->component_action, time(), $this->date_recorded ) );
             
             if ( $activity && $activity_cached )
@@ -79 +79 @@
     function exists() {
         global $wpdb, $bp;
-        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM " . $this->table_name . " WHERE item_id = %d AND secondary_item_id = %d AND user_id = %d AND component_name = %s AND component_action = %s", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action ) );       
+        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$this->table_name} WHERE item_id = %d AND secondary_item_id = %d AND user_id = %d AND component_name = %s AND component_action = %s", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action ) );     
     }
     
@@ -90 +90 @@
             return false;
         
-        if ( !$bp['activity'] )
+        if ( !$bp->activity )
             bp_activity_setup_globals();
         
@@ -98 +98 @@
         //error_log($wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
         //error_log($wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity_cached WHERE item_id = %d{$secondary_sql} AND component_name = %s AND component_action = %s", $item_id, $component_name, $component_action ) );
-        //error_log($wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
+        //error_log($wpdb->prepare( "DELETE FROM " . $bp->activity->table_name_sitewide . " WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
         
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
@@ -104 +104 @@
         // Delete this entry from the users' cache table and the sitewide cache table
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->base_prefix}user_{$user_id}_activity_cached WHERE item_id = %d{$secondary_sql} AND component_name = %s AND component_action = %s", $item_id, $component_name, $component_action ) );
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_sitewide} WHERE item_id = %d{$secondary_sql} AND user_id = %d AND component_name = %s AND component_action = %s", $item_id, $user_id, $component_name, $component_action ) );
         
         return true;
@@ -113 +113 @@
         
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
+            $user_id = $bp->displayed_user->id;
         
         if ( !$user_id )
@@ -127 +127 @@
         
         /* Determine whether or not to use the cached activity stream, or re-select and cache a new stream */
-        $last_cached = get_usermeta( $bp['current_userid'], 'bp_activity_last_cached' );
+        $last_cached = get_usermeta( $bp->displayed_user->id, 'bp_activity_last_cached' );
         
         if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) >= time() ) {
@@ -134 +134 @@
             
             // Use the cached activity stream.
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['activity']['table_name_current_user_cached'] . " WHERE date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC $limit_sql", $since ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name_current_user_cached} WHERE date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC $limit_sql", $since ) );
     
             for ( $i = 0; $i < count( $activities ); $i++ ) {
@@ -152 +152 @@
             
             // Reselect, format and cache a new activity stream. Override the limit otherwise we might only cache 5 items when viewing a profile page.
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['activity']['table_name_current_user'] . " WHERE date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC LIMIT 30", $since ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name_current_user} WHERE date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC LIMIT 30", $since ) );
 
             for ( $i = 0; $i < count( $activities ); $i++ ) {           
-                if ( function_exists( $bp[$activities[$i]->component_name]['format_activity_function'] ) ) {    
-                    if ( !$content = call_user_func($bp[$activities[$i]->component_name]['format_activity_function'], $activities[$i]->item_id, $activities[$i]->user_id, $activities[$i]->component_action, $activities[$i]->secondary_item_id ) )
+                if ( function_exists( $bp->{$activities[$i]->component_name}->format_activity_function ) ) {    
+                    if ( !$content = call_user_func( $bp->{$activities[$i]->component_name}->format_activity_function, $activities[$i]->item_id, $activities[$i]->user_id, $activities[$i]->component_action, $activities[$i]->secondary_item_id ) )
                         continue;
                     
@@ -199 +199 @@
         
         /* Determine whether or not to use the cached friends activity stream, or re-select and cache a new stream */
-        $last_cached = get_usermeta( $bp['loggedin_userid'], 'bp_activity_friends_last_cached' );
+        $last_cached = get_usermeta( $bp->loggedin_user->id, 'bp_activity_friends_last_cached' );
         
         if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) >= time() ) {
@@ -206 +206 @@
             
             // Use the cached activity stream.
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['activity']['table_name_loggedin_user_friends_cached'] . " ORDER BY date_recorded DESC $limit_sql" ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name_loggedin_user_friends_cached} ORDER BY date_recorded DESC $limit_sql" ) );
         
             for ( $i = 0; $i < count( $activities ); $i++ ) {
@@ -231 +231 @@
                 $table_name = $wpdb->base_prefix . 'user_' . $friend_ids[$i] . '_activity_cached';
 
-                $activities[$i]['activity'] = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $table_name . " WHERE is_private = 0 ORDER BY date_recorded $limit_sql" ) );
+                $activities[$i]['activity'] = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$table_name} WHERE is_private = 0 ORDER BY date_recorded $limit_sql" ) );
                 $activities[$i]['full_name'] = bp_fetch_user_fullname( $friend_ids[$i], false );
             }
@@ -265 +265 @@
         
         /* Remove entries that are older than 6 months */
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE DATE_ADD(date_recorded, INTERVAL 6 MONTH) <= NOW()" ) );
-        
-        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['activity']['table_name_sitewide'] . " ORDER BY date_recorded DESC $limit_sql" ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->activity->table_name_sitewide . " WHERE DATE_ADD(date_recorded, INTERVAL 6 MONTH) <= NOW()" ) );
+        
+        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp->activity->table_name_sitewide . " ORDER BY date_recorded DESC $limit_sql" ) );
         
         for ( $i = 0; $i < count( $activities ); $i++ ) {
@@ -289 +289 @@
                 $activity_feed[$i]['title'] = trim( strip_tags( $title[0] ) );
                 $activity_feed[$i]['link'] = $activities[$i]['primary_link'];
-                $activity_feed[$i]['description'] = sprintf ( $activities[$i]['content'], '' );
+                $activity_feed[$i]['description'] = sprintf( $activities[$i]['content'], '' );
                 $activity_feed[$i]['pubdate'] = $activities[$i]['date_recorded'];
         }
@@ -300 +300 @@
         
         /* Empty the cache */
-        $wpdb->query( "TRUNCATE TABLE " . $bp['activity']['table_name_loggedin_user_friends_cached'] );
+        $wpdb->query( "TRUNCATE TABLE {$bp->activity->table_name_loggedin_user_friends_cached}" );
         
         for ( $i = 0; $i < count($activity_array); $i++ ) {
             // Cache that sucka...
-            $cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_loggedin_user_friends_cached'] . " ( user_id, content, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), %s )", $activity_array[$i]['user_id'], $activity_array[$i]['content'], $activity_array[$i]['primary_link'], $activity_array[$i]['component_name'], $activity_array[$i]['component_action'], time(), $activity_array[$i]['date_recorded'] ) );
-        }
-        
-        update_usermeta( $bp['loggedin_userid'], 'bp_activity_friends_last_cached', time() );
+            $cached = $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->activity->table_name_loggedin_user_friends_cached} ( user_id, content, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), %s )", $activity_array[$i]['user_id'], $activity_array[$i]['content'], $activity_array[$i]['primary_link'], $activity_array[$i]['component_name'], $activity_array[$i]['component_action'], time(), $activity_array[$i]['date_recorded'] ) );
+        }
+        
+        update_usermeta( $bp->loggedin_user->id, 'bp_activity_friends_last_cached', time() );
     }
     
@@ -314 +314 @@
 
         /* Empty the cache */
-        $wpdb->query( "TRUNCATE TABLE " . $bp['activity']['table_name_current_user_cached'] );
+        $wpdb->query( "TRUNCATE TABLE {$bp->activity->table_name_current_user_cached}" );
         
         /* Empty user's activities from the sitewide stream */
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE user_id = %d", $user_id ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->activity->table_name_sitewide . " WHERE user_id = %d", $user_id ) );
         
         for ( $i = 0; $i < count($activity_array); $i++ ) {
@@ -323 +323 @@
             
             // Cache that sucka...
-            $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_current_user_cached'] . " ( content, item_id, secondary_item_id, primary_link, component_name, component_action, date_cached, date_recorded, is_private ) VALUES ( %s, %d, %d, %s, %s, %s, FROM_UNIXTIME(%d), %s, %d )", $activity_array[$i]['content'], $activity_array[$i]['item_id'], $activity_array[$i]['secondary_item_id'], $activity_array[$i]['primary_link'], $activity_array[$i]['component_name'], $activity_array[$i]['component_action'], time(), $activity_array[$i]['date_recorded'], $activity_array[$i]['is_private'] ) );
+            $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp->activity->table_name_current_user_cached . " ( content, item_id, secondary_item_id, primary_link, component_name, component_action, date_cached, date_recorded, is_private ) VALUES ( %s, %d, %d, %s, %s, %s, FROM_UNIXTIME(%d), %s, %d )", $activity_array[$i]['content'], $activity_array[$i]['item_id'], $activity_array[$i]['secondary_item_id'], $activity_array[$i]['primary_link'], $activity_array[$i]['component_name'], $activity_array[$i]['component_action'], time(), $activity_array[$i]['date_recorded'], $activity_array[$i]['is_private'] ) );
             
             // Add to the sitewide activity stream
             if ( !$activity_array[$i]['is_private'] && !$activity_array[$i]['no_sitewide_cache'] )
-                $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, content, item_id, secondary_item_id, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %s, %d, %d, %s, %s, %s, FROM_UNIXTIME(%d), %s )", $user_id, $activity_array[$i]['content'], $activity_array[$i]['item_id'], $activity_array[$i]['secondary_item_id'], $activity_array[$i]['primary_link'], $activity_array[$i]['component_name'], $activity_array[$i]['component_action'], time(), $activity_array[$i]['date_recorded'] ) );
-        }
-        
-        update_usermeta( $bp['current_userid'], 'bp_activity_last_cached', time() );
+                $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp->activity->table_name_sitewide . " ( user_id, content, item_id, secondary_item_id, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %s, %d, %d, %s, %s, %s, FROM_UNIXTIME(%d), %s )", $user_id, $activity_array[$i]['content'], $activity_array[$i]['item_id'], $activity_array[$i]['secondary_item_id'], $activity_array[$i]['primary_link'], $activity_array[$i]['component_name'], $activity_array[$i]['component_action'], time(), $activity_array[$i]['date_recorded'] ) );
+        }
+        
+        update_usermeta( $bp->displayed_user->id, 'bp_activity_last_cached', time() );
     }
     
@@ -337 +337 @@
 
         /* Empty user's activities from the sitewide stream */
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE user_id = %d", $user_id ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->activity->table_name_sitewide . " WHERE user_id = %d", $user_id ) );
 
         /* Empty the user's activity items and cached activity items */
@@ -349 +349 @@
         global $bp, $wpdb;
         
-        return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM " . $bp['activity']['table_name_sitewide'] . " ORDER BY date_recorded ASC LIMIT 1" ) );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM " . $bp->activity->table_name_sitewide . " ORDER BY date_recorded ASC LIMIT 1" ) );
     }
     

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

@@ -24 +24 @@
         
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
-
-        if ( $bp['current_component'] != $bp['activity']['slug'] || ( $bp['current_component'] == $bp['activity']['slug'] && $bp['current_action'] == 'just-me' || $bp['current_action'] == 'feed' ) ) {
+            $user_id = $bp->displayed_user->id;
+
+        if ( $bp->current_component != $bp->activity->slug || ( $bp->current_component == $bp->activity->slug && $bp->current_action == 'just-me' || $bp->current_action == 'feed' ) ) {
             $this->activities = BP_Activity_Activity::get_activity_for_user( $user_id, $limit );
         } else {
@@ -34 +34 @@
         $this->activity_count = count($this->activities);
     
-        $this->full_name = $bp['current_fullname'];
+        $this->full_name = $bp->displayed_user->fullname;
 
         $this->is_home = bp_is_home();
@@ -99 +99 @@
     global $bp, $activities_template, $bp_activity_user_id, $bp_activity_limit;
     
-    if ( $bp['current_action'] == 'my-friends' )
+    if ( $bp->current_action == 'my-friends' )
         $filter_content = false;
     else
@@ -105 +105 @@
     
     if ( !$bp_activity_user_id )
-        $bp_activity_user_id = $bp['current_userid'];
+        $bp_activity_user_id = $bp->displayed_user->id;
     
     if ( !$bp_activity_limit )
@@ -200 +200 @@
     global $bp;
     
-    echo apply_filters( 'bp_sitewide_activity_feed_link', site_url() . '/' . $bp['activity']['slug'] . '/feed' );
+    echo apply_filters( 'bp_sitewide_activity_feed_link', site_url() . '/' . $bp->activity->slug . '/feed' );
 }
 
@@ -206 +206 @@
     global $bp;
     
-    if ( ( $bp['current_component'] == $bp['profile']['slug'] ) || $bp['current_action'] == 'just-me' )
-        echo apply_filters( 'bp_activities_member_rss_link', $bp['current_domain'] . $bp['activity']['slug'] . '/feed' );
+    if ( ( $bp->current_component == $bp->profile->slug ) || $bp->current_action == 'just-me' )
+        echo apply_filters( 'bp_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed' );
     else
-        echo apply_filters( 'bp_activities_member_rss_link', $bp['current_domain'] . $bp['activity']['slug'] . '/my-friends/feed' );        
+        echo apply_filters( 'bp_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' );      
 }
 

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

@@ -33 +33 @@
     <?php if ( $activity ) : ?>
         <div class="item-options" id="activity-list-options">
-            <img src="<?php echo $bp['activity']['image_base'] ?>/rss.png" alt="<?php _e( 'RSS Feed', 'buddypress' ) ?>" /> <a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'Site Wide Activity RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a>
+            <img src="<?php echo $bp->activity->image_base; ?>/rss.png" alt="<?php _e( 'RSS Feed', 'buddypress' ) ?>" /> <a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'Site Wide Activity RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a>
         </div>
         <ul id="site-wide-stream" class="activity-list">

trunk/bp-activity/feeds/bp-activity-friends-feed.php

@@ -20 +20 @@
 
 <channel>
-    <title><?php echo $bp['current_fullname']; ?> - <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
+    <title><?php echo $bp->displayed_user->fullname; ?> - <?php _e( 'Friends Activity', 'buddypress' ) ?></title>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-    <link><?php $bp['current_domain'] . '/' . $bp['activity']['slug'] . '/my-friends/feed' ?></link>
-    <description><?php _e( sprintf( '%s - Friends Activity Feed', $bp['current_fullname'] ), 'buddypress' ) ?></description>
+    <link><?php $bp->displayed_user->domain . '/' . $bp->activity->slug . '/my-friends/feed' ?></link>
+    <description><?php _e( sprintf( '%s - Friends Activity Feed', $bp->displayed_user->fullname ), 'buddypress' ) ?></description>
     <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', bp_activity_get_last_updated(), false); ?></pubDate>
     <generator>http://buddypress.org/?bp-activity-version=<?php echo BP_ACTIVITY_VERSION ?></generator>

trunk/bp-activity/feeds/bp-activity-personal-feed.php

@@ -19 +19 @@
 
 <channel>
-    <title><?php echo $bp['current_fullname']; ?> - <?php _e( 'Activity', 'buddypress' ) ?></title>
+    <title><?php echo $bp->displayed_user->fullname; ?> - <?php _e( 'Activity', 'buddypress' ) ?></title>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-    <link><?php echo $bp['current_domain'] . $bp['activity']['slug'] . '/feed' ?></link>
-    <description><?php _e( sprintf( '%s - Activity Feed', $bp['current_fullname'] ), 'buddypress' ) ?></description>
+    <link><?php echo $bp->displayed_user->domain . $bp->activity->slug . '/feed' ?></link>
+    <description><?php _e( sprintf( '%s - Activity Feed', $bp->displayed_user->fullname ), 'buddypress' ) ?></description>
     <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', bp_activity_get_last_updated(), false); ?></pubDate>
     <generator>http://buddypress.org/?bp-activity-version=<?php echo BP_ACTIVITY_VERSION ?></generator>

trunk/bp-activity/feeds/bp-activity-sitewide-feed.php

@@ -22 +22 @@
     <title><?php echo get_site_option( 'site_name' ); ?> - <?php _e( 'Site Wide Activity', 'buddypress' ) ?></title>
     <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-    <link><?php echo site_url() . '/' . $bp['activity']['slug'] . '/feed' ?></link>
+    <link><?php echo site_url() . '/' . $bp->activity->slug . '/feed' ?></link>
     <description><?php _e( 'Site Wide Activity Feed', 'buddypress' ) ?></description>
     <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', bp_activity_get_last_updated(), false); ?></pubDate>

trunk/bp-blogs.php

@@ -31 +31 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     
-    $sql[] = "CREATE TABLE ". $bp['blogs']['table_name'] ." (
+    $sql[] = "CREATE TABLE {$bp->blogs->table_name} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id int(11) NOT NULL,
@@ -39 +39 @@
              ) {$charset_collate};";
 
-    $sql[] = "CREATE TABLE ". $bp['blogs']['table_name_blog_posts'] ." (
+    $sql[] = "CREATE TABLE {$bp->blogs->table_name_blog_posts} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id int(11) NOT NULL,
@@ -50 +50 @@
              ) {$charset_collate};";
 
-    $sql[] = "CREATE TABLE ". $bp['blogs']['table_name_blog_comments'] ." (
+    $sql[] = "CREATE TABLE {$bp->blogs->table_name_blog_comments} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id int(11) NOT NULL,
@@ -63 +63 @@
              ) {$charset_collate};";
     
-    $sql[] = "CREATE TABLE ". $bp['blogs']['table_name_blogmeta'] ." (
+    $sql[] = "CREATE TABLE {$bp->blogs->table_name_blogmeta} (
             id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
             blog_id int(11) NOT NULL,
@@ -87 +87 @@
         // 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'] ) );
+            $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp->blogs->table_name ) );
 
             for ( $i = 0; $i < count($blog_ids); $i++ ) {
@@ -110 +110 @@
     if ( is_site_admin() ) {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['blogs']['table_name'] . "%'") == false ) || ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )  )
+        if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->blogs->table_name . "%'") == false ) || ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )  )
             bp_blogs_install();
     }
@@ -127 +127 @@
     global $bp, $wpdb;
 
-    $bp['blogs'] = array(
-        'table_name' => $wpdb->base_prefix . 'bp_user_blogs',
-        'table_name_blog_posts' => $wpdb->base_prefix . 'bp_user_blogs_posts',
-        'table_name_blog_comments' => $wpdb->base_prefix . 'bp_user_blogs_comments',
-        'table_name_blogmeta' => $wpdb->base_prefix . 'bp_user_blogs_blogmeta',
-        'format_activity_function' => 'bp_blogs_format_activity',
-        'image_base' => site_url( MUPLUGINDIR . '/bp-groups/images' ),
-        'slug'       => BP_BLOGS_SLUG
-    );
-    
-    $bp['version_numbers'][$bp['blogs']['slug']] = BP_BLOGS_VERSION;
-    
-    /* Register 'groups' as a root component */
-    bp_core_add_root_component( $bp['blogs']['slug'] );
+    $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->table_name_blog_comments = $wpdb->base_prefix . 'bp_user_blogs_comments';
+    $bp->blogs->table_name_blogmeta = $wpdb->base_prefix . 'bp_user_blogs_blogmeta';
+    $bp->blogs->format_activity_function = 'bp_blogs_format_activity';
+    $bp->blogs->image_base = site_url( MUPLUGINDIR . '/bp-groups/images' );
+    $bp->blogs->slug = BP_BLOGS_SLUG;
+
+    $bp->version_numbers->blogs = BP_BLOGS_VERSION;
 }
 add_action( 'wp', 'bp_blogs_setup_globals', 1 );    
@@ -155 +150 @@
  *
  * Adds "Blog" to the navigation arrays for the current and logged in user.
- * $bp['bp_nav'] represents the main component navigation 
- * $bp['bp_users_nav'] represents the sub navigation when viewing a users
- * profile other than that of the current logged in user.
  * 
  * @package BuddyPress Blogs
@@ -167 +159 @@
     
     /* Add 'Blogs' to the main navigation */
-    bp_core_add_nav_item( __('Blogs', 'buddypress'), $bp['blogs']['slug'] );
-
-    if ( $bp['current_userid'] )
-        bp_core_add_nav_default( $bp['blogs']['slug'], 'bp_blogs_screen_my_blogs', 'my-blogs' );
-    
-    $blogs_link = $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/';
+    bp_core_add_nav_item( __( 'Blogs', 'buddypress' ), $bp->blogs->slug );
+
+    if ( $bp->displayed_user->id )
+        bp_core_add_nav_default( $bp->blogs->slug, 'bp_blogs_screen_my_blogs', 'my-blogs' );
+    
+    $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
     
     /* Add the subnav items to the blogs nav item */
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'my-blogs', __('My Blogs', 'buddypress'), $blogs_link, 'bp_blogs_screen_my_blogs', 'my-blogs-list' );
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-posts', __('Recent Posts', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_posts' );
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-comments', __('Recent Comments', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_comments' );
-    bp_core_add_subnav_item( $bp['blogs']['slug'], 'create-a-blog', __('Create a Blog', 'buddypress'), $blogs_link, 'bp_blogs_screen_create_a_blog' );
+    bp_core_add_subnav_item( $bp->blogs->slug, 'my-blogs', __('My Blogs', 'buddypress'), $blogs_link, 'bp_blogs_screen_my_blogs', 'my-blogs-list' );
+    bp_core_add_subnav_item( $bp->blogs->slug, 'recent-posts', __('Recent Posts', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_posts' );
+    bp_core_add_subnav_item( $bp->blogs->slug, 'recent-comments', __('Recent Comments', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_comments' );
+    bp_core_add_subnav_item( $bp->blogs->slug, 'create-a-blog', __('Create a Blog', 'buddypress'), $blogs_link, 'bp_blogs_screen_create_a_blog' );
     
     /* Set up the component options navigation for Blog */
-    if ( $bp['current_component'] == 'blogs' ) {
+    if ( $bp->current_component == 'blogs' ) {
         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_get_avatar( $bp['current_userid'], 1 );
-            $bp['bp_options_title'] = $bp['current_fullname']; 
+            $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+            $bp->bp_options_title = $bp->displayed_user->fullname; 
         }
     }
@@ -229 +221 @@
     /* Because blog, comment, and blog post code execution happens before anything else
        we need to manually instantiate the activity component globals */
-    if ( !$bp['activity'] && function_exists('bp_activity_setup_globals') )
+    if ( !$bp->activity && function_exists('bp_activity_setup_globals') )
         bp_activity_setup_globals();
 
@@ -364 +356 @@
     
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
         
     $name = get_blog_option( $blog_id, 'blogname' );
@@ -577 +569 @@
     
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => 'blogs', 'component_action' => 'new_blog', 'user_id' => $bp['loggedin_userid'] ) );
+    bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => 'blogs', 'component_action' => 'new_blog', 'user_id' => $bp->loggedin_user->id ) );
     
     do_action( 'bp_blogs_remove_blog', $blog_id );
@@ -635 +627 @@
 
     // Delete activity stream item
-    bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'user_id' => $bp['loggedin_userid'] ) );
+    bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'user_id' => $bp->loggedin_user->id ) );
 
     do_action( 'bp_blogs_remove_comment', $blog_id, $comment_id );
@@ -699 +691 @@
     global $bp, $wpdb;
     
-    if ( $bp['current_component'] == $bp['blogs']['slug'] && isset( $_GET['random-blog'] ) ) {
+    if ( $bp->current_component == $bp->blogs->slug && isset( $_GET['random-blog'] ) ) {
         $blog = bp_blogs_get_random_blog();
 
@@ -729 +721 @@
 
     if ( !$meta_key ) {
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['blogs']['table_name_blogpmeta'] . " WHERE blog_id = %d", $blog_id ) );      
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->blogs->table_name_blogpmeta . " 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 AND meta_value = %s", $blog_id, $meta_key, $meta_value ) );
     } else {
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['blogs']['table_name_blogmeta'] . " WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
     }
     
@@ -760 +752 @@
         //  $metas = array($user->$meta_key);
         //else
-        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp['blogs']['table_name_blogmeta'] . " WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key) );
+        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key) );
     } else {
-        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp['blogs']['table_name_blogmeta'] . " WHERE blog_id = %d", $blog_id) );
+        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id) );
     }
 
@@ -797 +789 @@
     }
 
-    $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 ) );
+    $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 ) );
+        $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 ) );
     } else if ( $cur->meta_value != $meta_value ) {
-        $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['blogs']['table_name_blogmeta'] . " SET meta_value = %s WHERE blog_id = %d AND meta_key = %s", $meta_value, $blog_id, $meta_key ) );
+        $wpdb->query( $wpdb->prepare( "UPDATE {$bp->blogs->table_name_blogmeta} SET meta_value = %s WHERE blog_id = %d AND meta_key = %s", $meta_value, $blog_id, $meta_key ) );
     } else {
         return false;

trunk/bp-blogs/bp-blogs-ajax.php

@@ -35 +35 @@
         <div id="blog-dir-count" class="pag-count">
             <?php echo sprintf( __( 'Viewing blog %d to %d (%d total active blogs)', 'buddypress' ), $from_num, $to_num, $blogs['total'] ); ?> &nbsp;
-            <img id="ajax-loader-blogs" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+            <img id="ajax-loader-blogs" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
         </div>
     
@@ -46 +46 @@
             <li>
                 <div class="item-avatar">
-                    <img src="<?php echo 'http://www.gravatar.com/avatar/' . md5( $blog->blog_id . '.blogs@' . $bp['root_domain'] ) . '?d=identicon&amp;s=50'; ?>" class="avatar" alt="Blog Identicon" />
+                    <img src="<?php echo 'http://www.gravatar.com/avatar/' . md5( $blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50'; ?>" class="avatar" alt="Blog Identicon" />
                 </div>
 

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -19 +19 @@
         
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
+            $user_id = $bp->displayed_user->id;
 
         $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
@@ -137 +137 @@
         
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
+            $user_id = $bp->displayed_user->id;
 
         $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
@@ -485 +485 @@
         
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
+            $user_id = $bp->displayed_user->id;
 
         $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
@@ -684 +684 @@
         <p><?php _e("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 $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog' ?>">
+        <form id="setupform" method="post" action="<?php echo $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog' ?>">
 
             <input type="hidden" name="stage" value="gimmeanotherblog" />
@@ -804 +804 @@
     
     if ( bp_is_home() ) {
-        echo apply_filters( 'bp_create_blog_link', '<a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog">' . __('Create a Blog', 'buddypress') . '</a>' );
+        echo apply_filters( 'bp_create_blog_link', '<a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog">' . __('Create a Blog', 'buddypress') . '</a>' );
     }
 }
@@ -815 +815 @@
         return false;
     
-    $current_tab = $bp['current_action'];
+    $current_tab = $bp->current_action
 ?>
     <ul class="content-header-nav">
-        <li<?php if ( $current_tab == 'my-blogs' || $current_tab == '' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['blogs']['slug'] ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp['current_fullname'] )  ?></a></li>
-        <li<?php if ( $current_tab == 'recent-posts' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['blogs']['slug'] ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp['current_fullname'] )  ?></a></li>
-        <li<?php if ( $current_tab == 'recent-comments' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['blogs']['slug'] ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp['current_fullname'] )  ?></a></li> 
+        <li<?php if ( $current_tab == 'my-blogs' || $current_tab == '' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+        <li<?php if ( $current_tab == 'recent-posts' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+        <li<?php if ( $current_tab == 'recent-comments' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li> 
     </ul>
 <?php

trunk/bp-blogs/directories/bp-blogs-directory-blogs.php

@@ -3 +3 @@
     global $bp, $current_blog;
     
-    if ( $bp['current_component'] == $bp['blogs']['slug'] && $bp['current_action'] == '' ) {
+    if ( $bp->current_component == $bp->blogs->slug && $bp->current_action == '' ) {
         add_action( 'bp_template_content', 'bp_blogs_directory_blogs_content' );
         add_action( 'bp_template_sidebar', 'bp_blogs_directory_blogs_sidebar' );
@@ -88 +88 @@
             <div id="blog-dir-count" class="pag-count">
                 <?php echo sprintf( __( 'Viewing blog %d to %d (%d total active blogs)', 'buddypress' ), $from_num, $to_num, $blogs['total'] ); ?> &nbsp;
-                <img id="ajax-loader-blogs" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+                <img id="ajax-loader-blogs" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
             </div>
             
@@ -99 +99 @@
                 <li>
                     <div class="item-avatar">
-                        <img src="<?php echo 'http://www.gravatar.com/avatar/' . md5( $blog->blog_id . '.blogs@' . $bp['root_domain'] ) . '?d=identicon&amp;s=50'; ?>" class="avatar" alt="Blog Identicon" />
+                        <img src="<?php echo 'http://www.gravatar.com/avatar/' . md5( $blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50'; ?>" class="avatar" alt="Blog Identicon" />
                     </div>
 
@@ -154 +154 @@
     <div class="widget">
         <h2 class="widgettitle"><?php _e( 'Find Blogs', 'buddypress' ) ?></h2>
-        <form action="<?php echo site_url() . '/' . $bp['blogs']['slug']  . '/search/' ?>" method="post" id="search-blogs-form">
+        <form action="<?php echo site_url() . '/' . $bp->blogs->slug  . '/search/' ?>" method="post" id="search-blogs-form">
             <label><input type="text" name="blogs_search" id="blogs_search" value="<?php if ( isset( $_GET['s'] ) ) { echo $_GET['s']; } else { _e('Search anything...', 'buddypress' ); } ?>"  onfocus="if (this.value == '<?php _e('Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e('Search anything...', 'buddypress' ) ?>';}" /></label>
             <input type="submit" id="blogs_search_submit" name="blogs_search_submit" value="Search" />

trunk/bp-core.php

@@ -55 +55 @@
 require_once( 'bp-core/bp-core-activation.php' );
 
-/* Define the slug for member pages and the members directory (e.g. example.com/[members] ) */
+/* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */
 define( 'MEMBERS_SLUG', apply_filters( 'bp_members_slug', 'members' ) );
 
@@ -91 +91 @@
     global $bp, $wpdb;
     global $current_user, $current_component, $current_action, $current_blog;
-    global $current_userid;
+    global $displayed_user_id;
     global $action_variables;
 
     /* The domain for the root of the site where the main blog resides */   
-    $bp['root_domain'] = bp_core_get_root_domain();
+    $bp->root_domain = bp_core_get_root_domain();
     
     /* The user ID of the user who is currently logged in. */
-    $bp['loggedin_userid'] = $current_user->ID;
+    $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['current_userid'] = $current_userid;
-    
-    /* The domain for the user currently logged in. eg: http://example.com/members/andy */
-    $bp['loggedin_domain'] = bp_core_get_user_domain($current_user->ID);
-    
-    /* The domain for the user currently being viewed */
-    $bp['current_domain'] = bp_core_get_user_domain($current_userid);
-    
-    /* The component being used eg: http://andy.example.com/ [profile] */
-    $bp['current_component'] = $current_component; // type: string
-    
-    /* The current action for the component eg: http://andy.example.com/profile/ [edit] */
-    $bp['current_action'] = $current_action; // type: string
-    
-    /* The action variables for the current action eg: http://andy.example.com/profile/edit/ [group] / [6] */
-    $bp['action_variables'] = $action_variables; // type: array
-    
-    /* Only used where a component has a sub item, e.g. groups: http://andy.example.com/groups/ [my-group] / home - manipulated in the actual component not in catch uri code.*/
-    $bp['current_item'] = ''; // type: string
-
-    /* The default component to use if none are set and someone visits: http://andy.example.com/ */
-    $bp['default_component'] = 'profile';
+    $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://andy.domain.com/ [profile] */
+    $bp->current_component = $current_component; // type: string
+    
+    /* The current action for the component eg: http://andy.domain.com/profile/ [edit] */
+    $bp->current_action = $current_action; // type: string
+    
+    /* The action variables for the current action eg: http://andy.domain.com/profile/edit/ [group] / [6] */
+    $bp->action_variables = $action_variables; // type: array
+    
+    /* Only used where a component has a sub item, e.g. groups: http://andy.domain.com/groups/ [my-group] / home - manipulated in the actual component not in catch uri code.*/
+    $bp->current_item = ''; // type: string
+
+    /* The default component to use if none are set and someone visits: http://andy.domain.com/ */
+    $bp->default_component = 'profile';
     
     /* Sets up the array container for the component navigation rendered by bp_get_nav() */
-    $bp['bp_nav'] = array();
+    $bp->bp_nav = array();
 
     /* Sets up the array container for the user navigation rendered by bp_get_user_nav() */
-    $bp['bp_users_nav'] = array();
+    $bp->bp_users_nav = array();
     
     /* Sets up the array container for the component options navigation rendered by bp_get_options_nav() */
-    $bp['bp_options_nav'] = array();
+    $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'] = '';
+    $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'] = '';
+    $bp->bp_options_avatar = '';
 
     /* Fetch the full name for the logged in and current user */
-    $bp['loggedin_fullname'] = bp_core_global_user_fullname( $bp['loggedin_userid'] );
-    $bp['current_fullname'] = bp_core_global_user_fullname( $bp['current_userid'] );
+    $bp->loggedin_user->fullname = bp_core_global_user_fullname( $bp->loggedin_user->id );
+    $bp->displayed_user->fullname = bp_core_global_user_fullname( $bp->displayed_user->id );
 
     /* Used to determine if user has admin rights on current content. If the logged in user is viewing
@@ -147 +147 @@
        generic variable so it can be used in other components. It can also be modified, so when viewing a group
        'is_item_admin' would be 1 if they are a group admin, 0 if they are not. */
-    $bp['is_item_admin'] = bp_is_home();
+    $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;
-    
-    $bp['core'] = array(
-        'image_base' => site_url( MUPLUGINDIR . '/bp-core/images' ),
-        'table_name_notifications' => $wpdb->base_prefix . 'bp_notifications'
-    );
+    $bp->is_item_mod = false;
+    
+    $bp->core->image_base = site_url( MUPLUGINDIR . '/bp-core/images' );
+    $bp->core->table_name_notifications = $wpdb->base_prefix . 'bp_notifications';
     
     /* Used to print version numbers in the footer for reference */
-    $bp['version_numbers']['core'] = BP_CORE_VERSION;
-    
-    if ( !$bp['current_component'] )
-        $bp['current_component'] = $bp['default_component'];
+    $bp->version_numbers = new stdClass;
+    $bp->version_numbers->core = BP_CORE_VERSION;
+    
+    if ( !$bp->current_component )
+        $bp->current_component = $bp->default_component;
 }
 add_action( 'wp', 'bp_core_setup_globals', 1 );
@@ -193 +192 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     
-    $sql[] = "CREATE TABLE ". $bp['core']['table_name_notifications'] ." (
+    $sql[] = "CREATE TABLE $bp->core->table_name_notifications (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id int(11) NOT NULL,
                 item_id int(11) NOT NULL,
-                secondary_item_id int(11) NOT NULL,
+                secondary_item_id int(11),
                 component_name varchar(75) NOT NULL,
                 component_action varchar(75) NOT NULL,
@@ -218 +217 @@
     // dbDelta won't change character sets, so we need to do this seperately.
     // This will only be in here pre v1.0
-    $wpdb->query( $wpdb->prepare( "ALTER TABLE " . $bp['core']['table_name_notifications'] . " DEFAULT CHARACTER SET %s", $wpdb->charset ) );
+    $wpdb->query( $wpdb->prepare( "ALTER TABLE $bp->core->table_name_notifications DEFAULT CHARACTER SET %s", $wpdb->charset ) );
     
     update_site_option( 'bp-core-db-version', BP_CORE_DB_VERSION );
@@ -241 +240 @@
     if ( is_site_admin() ) {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['core']['table_name_notifications'] . "%'") == false ) || ( get_site_option('bp-core-db-version') < BP_CORE_DB_VERSION )  )
+        if ( ( $wpdb->get_var("show tables like '%{$bp->core->table_name_notifications}%'") == false ) || ( get_site_option('bp-core-db-version') < BP_CORE_DB_VERSION )  )
             bp_core_install();
     }
@@ -263 +262 @@
     if ( is_site_admin() ) {
         /* Add the administration tab under the "Site Admin" tab for site administrators */
-        add_submenu_page( 'wpmu-admin.php', __('BuddyPress', 'buddypress'), __('BuddyPress', 'buddypress'), 1, 'bp_core_admin_settings', 'bp_core_admin_settings' );
+        add_submenu_page( 'wpmu-admin.php', __("BuddyPress", 'buddypress'), __("BuddyPress", 'buddypress'), 1, "bp_core_admin_settings", "bp_core_admin_settings" );
     }
 }
@@ -272 +271 @@
  *
  * Checks to see if a component's URL should be in the root, not under a member page:
- * eg: http://example.com/groups/the-group NOT http://example.com/members/andy/groups/the-group
+ * eg: http://domain.com/groups/the-group NOT http://domain.com/members/andy/groups/the-group
  * 
  * @package BuddyPress Core
@@ -280 +279 @@
     global $bp;
 
-    return in_array( $component_name, $bp['root_components'] );
+    return in_array( $component_name, $bp->root_components );
 }
 
@@ -304 +303 @@
         bp_core_add_nav_default( 'profile', 'bp_core_catch_profile_uri', 'public' );
 
-        $profile_link = $bp['loggedin_domain'] . '/profile/';
+        $profile_link = $bp->loggedin_user->domain . '/profile/';
 
         /* Add the subnav items to the profile */
         bp_core_add_subnav_item( 'profile', 'public', __('Public', 'buddypress'), $profile_link, 'xprofile_screen_display_profile' );
 
-        if ( $bp['current_component'] == 'profile' ) {
+        if ( $bp->current_component == 'profile' ) {
             if ( bp_is_home() ) {
-                $bp['bp_options_title'] = __('My Profile', 'buddypress');
+                $bp->bp_options_title = __('My Profile', 'buddypress');
             } else {
-                $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
-                $bp['bp_options_title'] = $bp['current_fullname']; 
+                $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+                $bp->bp_options_title = $bp->displayed_user->fullname; 
             }
         }
@@ -326 +325 @@
  *
  * Returns the domain for the passed user:
- * e.g. http://example.com/members/andy/
+ * e.g. http://domain.com/members/andy/
  * 
  * @package BuddyPress Core
@@ -338 +337 @@
     if ( !$user_id ) return;
     
-    $ud = get_userdata( $user_id );
-    
-    return $bp['root_domain'] . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/';
+    $ud = get_userdata($user_id);
+    
+    return $bp->root_domain . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/';
 }
 
@@ -347 +346 @@
  *
  * Returns the domain for the root blog.
- * eg: http://example.com/ OR https://example.com
+ * eg: http://domain.com/ OR https://domain.com
  * 
  * @package BuddyPress Core
@@ -364 +363 @@
 
 /**
- * bp_core_get_current_userid()
- *
- * Returns the user id for the user that is currently being viewed.
- * eg: http://andy.example.com/ or http://example.com/andy/
+ * bp_core_get_displayed_userid()
+ *
+ * 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.
  * @uses bp_core_get_userid_from_user_login() Returns the user id for the username passed
- * @return $current_userid The user id for the user that is currently being viewed, return zero if this is not a user home and just a normal blog.
- */
-function bp_core_get_current_userid( $user_login ) {
+ * @return The user id for the user that is currently being displayed, return zero if this is not a user home and just a normal blog.
+ */
+function bp_core_get_displayed_userid( $user_login ) {
     return bp_core_get_userid_from_user_login( $user_login );
 }
@@ -395 +394 @@
     global $bp;
     
-    $nav_key = count($bp['bp_nav']) + 1;
-    $user_nav_key = count($bp['bp_users_nav']) + 1;
+    $nav_key = count($bp->bp_nav) + 1;
+    $user_nav_key = count($bp->bp_users_nav) + 1;
     
     if ( !$css_id )
         $css_id = $slug;
 
-    $bp['bp_nav'][$nav_key] = array(
+    $bp->bp_nav[$nav_key] = array(
         'name'   => $name, 
-        'link'   => $bp['loggedin_domain'] . $slug,
+        'link'   => $bp->loggedin_user->domain . $slug,
         'css_id' => $css_id
     );
     
     if ( $add_to_usernav ) {
-        $bp['bp_users_nav'][$user_nav_key] = array(
+        $bp->bp_users_nav[$user_nav_key] = array(
             'name'   => $name, 
-            'link'   => $bp['current_domain'] . $slug,
+            'link'   => $bp->displayed_user->domain . $slug,
             'css_id' => $css_id
         );
@@ -441 +440 @@
         $css_id = $slug;
 
-    $bp['bp_options_nav'][$parent_id][$slug] = array(
+    $bp->bp_options_nav[$parent_id][$slug] = array(
         'name' => $name,
         'link' => $link . $slug,
@@ -447 +446 @@
     );
     
-    if ( function_exists($function) && $user_has_access && $bp['current_action'] == $slug && $bp['current_component'] == $parent_id )
+    if ( function_exists($function) && $user_has_access && $bp->current_action == $slug && $bp->current_component == $parent_id )
         add_action( 'wp', $function, 3 );
 }
@@ -464 +463 @@
     global $bp;
 
-    unset($bp['bp_options_nav'][$parent_id]);
+    unset($bp->bp_options_nav[$parent_id]);
 }
 
@@ -489 +488 @@
         return false;
 
-    if ( $bp['current_component'] == $parent_id && !$bp['current_action'] ) {
+    if ( $bp->current_component == $parent_id && !$bp->current_action ) {
         if ( function_exists($function) ) {
             add_action( 'wp', $function, 3 );
@@ -495 +494 @@
         
         if ( $slug )
-            $bp['current_action'] = $slug;
+            $bp->current_action = $slug;
     }
 }
@@ -522 +521 @@
  * bp_core_add_root_component()
  *
- * Adds a component to the $bp['root_components'] global.
+ * Adds a component to the $bp->root_components global.
  * Any component that runs in the "root" of an install should be added.
  * The "root" as in, it can or always runs outside of the /members/username/ path.
  *
  * Example of a root component:
- *  Groups: http://example.com/groups/group-name
- *          http://community.example.com/groups/group-name
- *          http://example.com/wpmu/groups/group-name
+ *  Groups: http://domain.com/groups/group-name
+ *          http://community.domain.com/groups/group-name
+ *          http://domain.com/wpmu/groups/group-name
  *
  * Example of a component that is NOT a root component:
- *  Friends: http://example.com/members/andy/friends
- *           http://community.example.com/members/andy/friends
- *           http://example.com/wpmu/members/andy/friends
+ *  Friends: http://domain.com/members/andy/friends
+ *           http://community.domain.com/members/andy/friends
+ *           http://domain.com/wpmu/members/andy/friends
  * 
  * @package BuddyPress Core
@@ -543 +542 @@
     global $bp;
 
-    $bp['root_components'][] = $slug;
+    $bp->root_components[] = $slug;
 }
 
@@ -560 +559 @@
     global $bp, $wpdb;
     
-    if ( $bp['current_component'] == MEMBERS_SLUG && isset( $_GET['random'] ) ) {
+    if ( $bp->current_component == MEMBERS_SLUG && isset( $_GET['random'] ) ) {
         $user = BP_Core_User::get_random_users(1);
 
         $ud = get_userdata( $user['users'][0]->user_id );
-        bp_core_redirect( $bp['root_domain'] . '/' . MEMBERS_SLUG . '/' . $ud->user_login );
+        bp_core_redirect( $bp->root_domain . '/' . MEMBERS_SLUG . '/' . $ud->user_login );
     }
 }
@@ -647 +646 @@
     $ud = get_userdata($uid);
         
-    return $bp['root_domain'] . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/';
+    return $bp->root_domain . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/';
 }
 
@@ -670 +669 @@
  *
  * Returns a HTML formatted link for a user with the user's full name as the link text.
- * eg: <a href="http://andy.example.com/">Andy Peatling</a>
+ * 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. 
@@ -980 +979 @@
     global $bp;
     
-    if ( !is_user_logged_in() || !get_usermeta( $bp['loggedin_userid'], 'last_activity') )
+    if ( !is_user_logged_in() )
         return false;
     
-    if ( time() >= strtotime('+5 minutes', get_usermeta( $bp['loggedin_userid'], 'last_activity') ) || get_usermeta( $bp['loggedin_userid'], 'last_activity') == '' ) {
+    if ( time() >= strtotime( '+5 minutes', get_usermeta( $bp->loggedin_user->id, 'last_activity' ) ) || '' == get_usermeta( $bp->loggedin_user->id, 'last_activity' ) ) {
         // Updated last site activity for this user.
-        update_usermeta( $bp['loggedin_userid'], 'last_activity', time() );
+        update_usermeta( $bp->loggedin_user->id, 'last_activity', time() );
     }
 }
@@ -1003 +1002 @@
  */
 function bp_core_get_last_activity( $last_activity_date, $string ) {
-    if ( !$last_activity_date || $last_activity_date == '' ) {
+    if ( !$last_activity_date || empty( $last_activity_date ) ) {
         $last_active = __('not recently active', 'buddypress');
     } else {
@@ -1032 +1031 @@
     
     if ( !$user_id )
-        $user_id = $bp['current_userid'];
+        $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 ) );
@@ -1103 +1102 @@
     foreach ( (array)$nav_array as $key => $value ) {
         switch ( $nav_array[$key]['css_id'] ) {
-            case $bp['activity']['slug']:
+            case $bp->activity->slug:
                 $new_nav[0] = $nav_array[$key];
                 unset($nav_array[$key]);
             break;
-            case $bp['profile']['slug']:
+            case $bp->profile->slug:
                 $new_nav[1] = $nav_array[$key];
                 unset($nav_array[$key]);
@@ -1115 +1114 @@
                 unset($nav_array[$key]);
             break;
-            case $bp['blogs']['slug']:
+            case $bp->blogs->slug:
                 $new_nav[2] = $nav_array[$key];
                 unset($nav_array[$key]);
             break;
-            case $bp['wire']['slug']:
+            case $bp->wire->slug:
                 $new_nav[3] = $nav_array[$key];
                 unset($nav_array[$key]);
             break;
-            case $bp['messages']['slug']:
+            case $bp->messages->slug:
                 $new_nav[4] = $nav_array[$key];
                 unset($nav_array[$key]);
             break;
-            case $bp['friends']['slug']:
+            case $bp->friends->slug:
                 $new_nav[5] = $nav_array[$key];
                 unset($nav_array[$key]);
             break;
-            case $bp['groups']['slug']:
+            case $bp->groups->slug:
                 $new_nav[6] = $nav_array[$key];
                 unset($nav_array[$key]);
             break;
-            case $bp['photos']['slug']:
+            case $bp->photos->slug:
                 $new_nav[7] = $nav_array[$key];
                 unset($nav_array[$key]);
             break;
-            case $bp['account']['slug']:
+            case $bp->account->slug:
                 $new_nav[8] = $nav_array[$key];
                 unset($nav_array[$key]);
@@ -1197 +1196 @@
     
     $current = maybe_unserialize( get_site_option( 'illegal_names' ) );
-    $bp_illegal_names = $bp['root_components'];
+    $bp_illegal_names = $bp->root_components;
     
     if ( is_array( $current ) ) {
@@ -1252 +1251 @@
     require_once( ABSPATH . '/wp-admin/includes/user.php' );
 
-    return wpmu_delete_user( $bp['loggedin_userid'] );
+    return wpmu_delete_user( $bp->loggedin_user->id  );
 }
 
@@ -1258 +1257 @@
     global $bp;
     
-    if ( $bp['current_component'] == SEARCH_SLUG ) {
+    if ( $bp->current_component == SEARCH_SLUG ) {
         $search_terms = $_POST['search-terms'];
         $search_which = $_POST['search-which'];
@@ -1303 +1302 @@
     global $bp;
     
-    foreach ( $bp['version_numbers'] as $name => $version ) {
+    foreach ( $bp->version_numbers as $name => $version ) {
         echo ucwords($name) . ': <b>' . $version . '</b> / ';
     }

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

@@ -15 +15 @@
             if ( function_exists( 'xprofile_install' ) ) {
                 if ( $key == 'bp-xprofile-base-group-name' ) {
-                    $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') ) ) );
+                    $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 ( $key == 'bp-xprofile-fullname-field-name' ) {
-                    $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') ) ) );
+                    $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') ) ) );
                 }
             }

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

@@ -27 +27 @@
     global $bp;
     
-    echo '<a href="' . $bp['root_domain'] . '"><img id="admin-bar-logo" src="' . apply_filters( 'bp_admin_bar_logo_src', site_url( MUPLUGINDIR . '/bp-core/images/admin_bar_logo.gif' ) ) . '" alt="' . apply_filters( 'bp_admin_bar_logo_alt_text', __( 'BuddyPress', 'buddypress' ) ) . '" /></a>';
+    echo '<a href="' . $bp->root_domain . '"><img id="admin-bar-logo" src="' . apply_filters( 'bp_admin_bar_logo_src', site_url( MUPLUGINDIR . '/bp-core/images/admin_bar_logo.gif' ) ) . '" alt="' . apply_filters( 'bp_admin_bar_logo_alt_text', __( 'BuddyPress', 'buddypress' ) ) . '" /></a>';
 }
 
@@ -49 +49 @@
     
     /* Sort the nav by key as the array has been put together in different locations */
-    $bp['bp_nav'] = bp_core_sort_nav_items( $bp['bp_nav'] );
+    $bp->bp_nav = bp_core_sort_nav_items( $bp->bp_nav );
     
     if ( is_user_logged_in() ) {
@@ -60 +60 @@
         /* Loop through each navigation item */
         $counter = 0;
-        foreach( $bp['bp_nav'] as $nav_item ) {
+        foreach( $bp->bp_nav as $nav_item ) {
             $alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
             
@@ -66 +66 @@
             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']] ) ) {
+            if ( is_array( $bp->bp_options_nav[$nav_item['css_id']] ) ) {
                 echo '<ul>';
                 $sub_counter = 0;
-                foreach( $bp['bp_options_nav'][$nav_item['css_id']] as $subnav_item ) {
+                foreach( $bp->bp_options_nav[$nav_item['css_id']] as $subnav_item ) {
                     $alt = ( $sub_counter % 2 == 0 ) ? ' class="alt"' : '';
                     echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';               
@@ -126 +126 @@
     
         if ( function_exists('bp_blogs_install') ) {
-            $blogs = get_blogs_of_user( $bp['loggedin_userid'] ); // find *all* blogs with any kind of role
-
-            echo '<li><a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/my-blogs">';
+            $blogs = get_blogs_of_user( $bp->loggedin_user->id ); // find *all* blogs with any kind of role
+
+            echo '<li><a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/my-blogs">';
             
             _e( 'My Blogs', 'buddypress' );
@@ -139 +139 @@
                 $counter = 0;
                 foreach( $blogs as $blog ) {
-                    $role = get_blog_role_for_user( $bp['loggedin_userid'], $blog->userblog_id );
+                    $role = get_blog_role_for_user( $bp->loggedin_user->id, $blog->userblog_id );
 
                     $alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
@@ -163 +163 @@
 
             echo '<li' . $alt . '>';
-            echo '<a href="' . $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/create-a-blog">' . __('Create a Blog!', 'buddypress') . '</a>';
+            echo '<a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog">' . __('Create a Blog!', 'buddypress') . '</a>';
             echo '</li>';
     
@@ -177 +177 @@
         global $bp;
         
-        echo '<li id="bp-admin-notifications_menu"><a href="' . $bp['loggedin_domain'] . '">';
+        echo '<li id="bp-admin-notifications_menu"><a href="' . $bp->loggedin_user->domain . '">';
         _e( 'Notifications', 'buddypress' );
     
-        if ( $notifications = bp_core_get_notifications_for_user( $bp['loggedin_userid']) ) { ?>
+        if ( $notifications = bp_core_get_notifications_for_user( $bp->loggedin_user->id ) ) { ?>
             <span><?php echo count($notifications) ?></span>
         <?php
@@ -196 +196 @@
             <?php } ?>
         <?php } else { ?>
-            <li><a href="<?php echo $bp['loggedin_domain'] ?>"><?php _e( 'No new notifications.', 'buddypress' ); ?></a></li>
+            <li><a href="<?php echo $bp->loggedin_user->domain ?>"><?php _e( 'No new notifications.', 'buddypress' ); ?></a></li>
         <?php
         }
@@ -243 +243 @@
         <a href="#"><?php _e( 'Visit', 'buddypress' ) ?></a>
         <ul class="random-list">
-            <li><a href="<?php echo $bp['root_domain'] . '/' . MEMBERS_SLUG . '/?random' ?>"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
+            <li><a href="<?php echo $bp->root_domain . '/' . MEMBERS_SLUG . '/?random' ?>"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
 
             <?php if ( function_exists('groups_install') ) : ?>
-            <li class="alt"><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/?random' ?>"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
+            <li class="alt"><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug . '/?random' ?>"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
             <?php endif; ?>
 
             <?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>
+            <li><a href="<?php echo $bp->root_domain . '/' . $bp->blogs->slug . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
             
             <?php endif; ?>

trunk/bp-core/bp-core-ajax.php

@@ -92 +92 @@
         <div id="member-dir-count" class="pag-count">
             <?php echo sprintf( __( 'Viewing member %d to %d (%d total active members)', 'buddypress' ), $from_num, $to_num, $users['total'] ); ?> &nbsp;
-            <img id="ajax-loader-members" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+            <img id="ajax-loader-members" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
         </div>
     

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

@@ -35 +35 @@
     
     $avatar_file = get_usermeta( $user, "bp_core_avatar_v$version" );
-    $url = $bp['root_domain'] . '/' . $avatar_file;
+    $url = $bp->root_domain . '/' . $avatar_file;
     
     if ( strlen($avatar_file) ) {
@@ -46 +46 @@
         $grav_option = get_site_option('user-avatar-default');
         
-        if ( $grav_option == '' ) {
+        if ( empty( $grav_option ) ) {
             $default_grav = 'wavatar';
         } else if ( $grav_option == 'mystery' ) {
@@ -226 +226 @@
 
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
 
     $path  = get_blog_option( 1, 'upload_path' );
@@ -271 +271 @@
     
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
 
     $src = str_replace( array(ABSPATH), array(site_url() . '/'), $new );
@@ -477 +477 @@
     global $bp;
     echo '<p><strong>' . $msg . '</strong></p>';
-    echo '<p><a href="' . $bp['loggedin_domain'] . $bp['profile']['slug'] . '/change-avatar">' . __('Try Again', 'buddypress') . '</a></p>';
+    echo '<p><a href="' . $bp->loggedin_user->domain . $bp->profile->slug . '/change-avatar">' . __('Try Again', 'buddypress') . '</a></p>';
     echo '</div>';
     exit;

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

@@ -15 +15 @@
  *
  * The URI's are broken down as follows:
- *   - http:// example.com / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
- *   - OUTSIDE ROOT: http:// example.com / sites / buddypress / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
+ *   - 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://example.com/members/andy/profile/edit/group/5/
+ *    - http://domain.com/members/andy/profile/edit/group/5/
  *    - $current_component: string 'profile'
  *    - $current_action: string 'edit'
@@ -28 +28 @@
 function bp_core_set_uri_globals() {
     global $current_component, $current_action, $action_variables;
-    global $current_userid;
+    global $displayed_user_id;
     global $is_member_page, $is_new_friend;
     global $bp_unfiltered_uri;
@@ -85 +85 @@
 
     /* Catch a member page and set the current member ID */
-    if ( $bp_uri[0] == MEMBERS_SLUG && $bp_uri[1] != '' ) {
+    if ( $bp_uri[0] == MEMBERS_SLUG && !empty( $bp_uri[1] ) ) {
         $is_member_page = true;
         $is_root_component = true;
         
         // We are within a member page, set up user id globals
-        $current_userid = bp_core_get_current_userid( $bp_uri[1] );
+        $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
                 
         unset($bp_uri[0]);
@@ -105 +105 @@
         $bp_uri = array_merge( array(), $bp_uri );
     }
-    
+
     /* This is used to determine where the component and action indexes should start */
-    $root_components = $bp['root_components'];
+    $root_components = $bp->root_components;
     
     if ( !isset($is_root_component) )
@@ -160 +160 @@
 
     $bp_path = $pages;
-    
+
     if ( !bp_is_blog_page() )
         remove_action( 'template_redirect', 'redirect_canonical' );
@@ -227 +227 @@
         
     // If this user does not exist, redirect to the root domain.
-    if ( !$bp['current_userid'] && $bp_unfiltered_uri[0] == MEMBERS_SLUG && isset($bp_unfiltered_uri[1]) )
-        bp_core_redirect( $bp['root_domain'] );
+    if ( !$bp->displayed_user->id && $bp_unfiltered_uri[0] == MEMBERS_SLUG && isset($bp_unfiltered_uri[1]) )
+        bp_core_redirect( $bp->root_domain );
 
     if ( !$bp_path && !bp_is_blog_page() ) {
         if ( is_user_logged_in() ) {
-            wp_redirect( $bp['loggedin_domain'] );
+            wp_redirect( $bp->loggedin_user->domain );
         } else {
             wp_redirect( site_url( 'wp-login.php?redirect_to=' . site_url() . $_SERVER['REQUEST_URI'] ) );
@@ -264 +264 @@
     $member_theme = get_site_option('active-member-theme');
     
-    if ( $member_theme == '' )
+    if ( empty( $member_theme ) )
         $member_theme = 'buddypress-member';
     
@@ -283 +283 @@
     $member_theme = get_site_option('active-member-theme');
     
-    if ( $member_theme == '' )
+    if ( empty( $member_theme ) )
         $member_theme = 'buddypress-member';
 
@@ -297 +297 @@
 add_filter( 'stylesheet', 'bp_core_force_buddypress_stylesheet', 1, 1 );
 
-
-
 ?>

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

@@ -91 +91 @@
                     $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>';
+                $this->total_friends = '<a href="' . $this->user_url . $bp->friends->slug . '" title="' . sprintf( __( "%s's friend list", 'buddypress' ), $this->fullname ) . '">' . $this->total_friends . '</a>';
             }
         }
@@ -102 +102 @@
                     $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>';
+                $this->total_blogs = '<a href="' . $this->user_url . $bp->blogs->slug . '" title="' . sprintf( __( "%s's blog list", 'buddypress' ), $this->fullname ) . '">' . $this->total_blogs . '</a>';
             }
         }
@@ -115 +115 @@
                     $this->total_groups .= ' ' . __( 'groups', 'buddypress' );
 
-                $this->total_groups = '<a href="' . $this->user_url . $bp['groups']['slug'] . '" title="' . sprintf( __( "%s's group list", 'buddypress' ), $this->fullname ) . '">' . $this->total_groups . '</a>';
+                $this->total_groups = '<a href="' . $this->user_url . $bp->groups->slug . '" title="' . sprintf( __( "%s's group list", 'buddypress' ), $this->fullname ) . '">' . $this->total_groups . '</a>';
             }
         }
@@ -167 +167 @@
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-        $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}users u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND() DESC", $bp['loggedin_userid'] ) );
-        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}users u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND(){$pag_sql}", $bp['loggedin_userid'] ) );
+        $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}users u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND() DESC", $bp->loggedin_user->id ) );
+        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}users u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND(){$pag_sql}", $bp->loggedin_user->id ) );
         
         return array( 'users' => $paged_users, 'total' => $total_users );
@@ -181 +181 @@
         $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(um.user_id) FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}users 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 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC" ) );
         $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT um.user_id FROM {$wpdb->base_prefix}usermeta um LEFT JOIN {$wpdb->base_prefix}users 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 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}" ) );
-        
+
         return array( 'users' => $paged_users, 'total' => $total_users );
     }
@@ -199 +199 @@
         like_escape($letter);
 
-        $total_users = count( $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID user_id FROM {$wpdb->base_prefix}users u LEFT JOIN {$bp['profile']['table_name_data']} pd ON u.ID = pd.user_id LEFT JOIN {$bp['profile']['table_name_fields']} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) ) );
-        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM {$wpdb->base_prefix}users u LEFT JOIN {$bp['profile']['table_name_data']} pd ON u.ID = pd.user_id LEFT JOIN {$bp['profile']['table_name_fields']} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
+        $total_users = count( $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID user_id FROM {$wpdb->base_prefix}users u LEFT JOIN $bp->profile->table_name_data pd ON u.ID = pd.user_id LEFT JOIN $bp->profile->table_name_fields pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ) ) );
+        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM {$wpdb->base_prefix}users u LEFT JOIN $bp->profile->table_name_data pd ON u.ID = pd.user_id LEFT JOIN $bp->profile->table_name_fields pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
         
         return array( 'users' => $paged_users, 'total' => $total_users );
@@ -216 +216 @@
         like_escape($search_terms); 
 
-        $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(u.ID) as user_id FROM {$wpdb->base_prefix}users u LEFT JOIN {$bp['profile']['table_name_data']} pd ON u.ID = pd.user_id WHERE pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC" ) );
-        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM {$wpdb->base_prefix}users u LEFT JOIN {$bp['profile']['table_name_data']} pd ON u.ID = pd.user_id WHERE pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}" ) );
+        $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(u.ID) as user_id FROM {$wpdb->base_prefix}users u LEFT JOIN $bp->profile->table_name_data pd ON u.ID = pd.user_id WHERE pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC" ) );
+        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM {$wpdb->base_prefix}users u LEFT JOIN $bp->profile->table_name_data pd ON u.ID = pd.user_id WHERE pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}" ) );
         
         return array( 'users' => $paged_users, 'total' => $total_users );
@@ -251 +251 @@
         global $wpdb, $bp;
         
-        if ( $notification = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['core']['table_name_notifications'] . " WHERE id = %d", $this->id ) ) ) {
+        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->secondary_item_id = $notification->secondary_item_id;
@@ -267 +267 @@
         if ( $this->id ) {
             // Update
-            $sql = $wpdb->prepare( "UPDATE " . $bp['core']['table_name_notifications'] . " SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d), is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
+            $sql = $wpdb->prepare( "UPDATE {$bp->core->table_name_notifications} SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d), is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
         } else {
             // Save
-            $sql = $wpdb->prepare( "INSERT INTO " . $bp['core']['table_name_notifications'] . " ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->core->table_name_notifications} ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
         }
 
@@ -285 +285 @@
         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 ) );
+        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 ) );
+
+        return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND is_new = 1", $user_id ) );
     }
     
@@ -297 +297 @@
         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 ) );
+        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 ) );
     }
     
@@ -306 +306 @@
             $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 ) );
+        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 ) );
     }
     

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

@@ -25 +25 @@
 
 function bp_core_delete_notification( $id ) {
-    if ( !bp_core_check_notification_access( $bp['loggedin_userid'], $id ) )
+    if ( !bp_core_check_notification_access( $bp->loggedin_user->id, $id ) )
         return false;
     

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

@@ -7 +7 @@
     bp_core_add_nav_default( 'settings', 'bp_core_screen_general_settings', 'general', false );
     
-    bp_core_add_subnav_item( 'settings', 'general', __('General', 'buddypress'), $bp['loggedin_domain'] . 'settings/', 'bp_core_screen_general_settings', false, bp_is_home() );
-    bp_core_add_subnav_item( 'settings', 'notifications', __('Notifications', 'buddypress'), $bp['loggedin_domain'] . 'settings/', 'bp_core_screen_notification_settings', false, bp_is_home() );
-    bp_core_add_subnav_item( 'settings', 'delete-account', __('Delete Account', 'buddypress'), $bp['loggedin_domain'] . 'settings/', 'bp_core_screen_delete_account', false, bp_is_home() );
+    bp_core_add_subnav_item( 'settings', 'general', __('General', 'buddypress'), $bp->loggedin_user->domain . 'settings/', 'bp_core_screen_general_settings', false, bp_is_home() );
+    bp_core_add_subnav_item( 'settings', 'notifications', __('Notifications', 'buddypress'), $bp->loggedin_user->domain . 'settings/', 'bp_core_screen_notification_settings', false, bp_is_home() );
+    bp_core_add_subnav_item( 'settings', 'delete-account', __('Delete Account', 'buddypress'), $bp->loggedin_user->domain . 'settings/', 'bp_core_screen_delete_account', false, bp_is_home() );
 }
 add_action( 'wp', 'bp_core_add_settings_nav', 2 );
@@ -37 +37 @@
                 $pass_error = true;
             }
-        } else if ( $_POST['pass1'] == '' && $_POST['pass2'] != '' || $_POST['pass1'] != '' && $_POST['pass2'] == '' ) {
+        } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
             $pass_error = true;
         } else {
@@ -72 +72 @@
     <?php } ?>
 
-    <form action="<?php echo $bp['loggedin_domain'] . 'settings/general' ?>" method="post" id="settings-form">
+    <form action="<?php echo $bp->loggedin_user->domain . 'settings/general' ?>" method="post" id="settings-form">
         <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
         <input type="text" name="email" id="email" value="<?php echo $current_user->user_email ?>" class="settings-input" />
@@ -122 +122 @@
     <?php } ?>
     
-    <form action="<?php echo $bp['loggedin_domain'] . 'settings/notifications' ?>" method="post" id="settings-form">
+    <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>
@@ -165 +165 @@
                 $pass_error = true;
             }
-        } else if ( $_POST['pass1'] == '' && $_POST['pass2'] != '' || $_POST['pass1'] != '' && $_POST['pass2'] == '' ) {
+        } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
             $pass_error = true;
         } else {
@@ -188 +188 @@
     global $bp, $current_user, $bp_settings_updated, $pass_error;   ?>
 
-    <form action="<?php echo $bp['loggedin_domain'] . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
+    <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">

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

@@ -4 +4 @@
  * TEMPLATE TAG
  *
- * Uses the $bp['bp_nav'] global to render out the navigation within a BuddyPress install.
+ * 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.
  * 
@@ -20 +20 @@
     
     /* Sort the nav by key as the array has been put together in different locations */
-    $bp['bp_nav'] = bp_core_sort_nav_items( $bp['bp_nav'] );
+    $bp->bp_nav = bp_core_sort_nav_items( $bp->bp_nav );
 
     /* Loop through each navigation item */
-    foreach( (array) $bp['bp_nav'] as $nav_item ) {
+    foreach( (array) $bp->bp_nav as $nav_item ) {
         /* If the current component matches the nav item id, then add a highlight CSS class. */
-        if ( $bp['current_component'] == $nav_item['css_id'] ) {
+        if ( $bp->current_component == $nav_item['css_id'] ) {
             $selected = ' class="current"';
         } else {
@@ -31 +31 @@
         }
         
-        /* If we are viewing another person (current_userid does not equal loggedin_userid)
+        /* 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
            to the friends nav item if it exists. */
-        if ( !bp_is_home() && $bp['current_userid'] ) {
+        if ( !bp_is_home() && $bp->displayed_user->id ) {
             if ( function_exists('friends_install') ) {
-                if ( friends_check_friendship( $bp['loggedin_userid'], $bp['current_userid'] ) && $nav_item['css_id'] == $bp['friends']['slug'] ) {
+                if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) && $nav_item['css_id'] == $bp->friends->slug ) {
                     $selected = ' class="current"';
                 } else { 
@@ -60 +60 @@
  * TEMPLATE TAG
  *
- * Uses the $bp['bp_options_nav'] global to render out the sub navigation for the current component.
+ * 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.
  * 
@@ -78 +78 @@
     /* Only render this navigation when the logged in user is looking at one of their own pages. */
     if ( bp_is_home() || $is_single_group ) {
-        if ( count( $bp['bp_options_nav'][$bp['current_component']] ) < 1 )
+        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 $slug => $values ) {
+        foreach ( $bp->bp_options_nav[$bp->current_component] as $slug => $values ) {
             $title = $values['name'];
             $link = $values['link'];
@@ -88 +88 @@
             
             /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
-            if ( $slug == $bp['current_action'] || in_array( $slug, $bp['action_variables'] ) ) {
+            if ( $slug == $bp->current_action || in_array( $slug, $bp->action_variables ) ) {
                 $selected = ' class="current"';
             } else {
@@ -98 +98 @@
         }
     } else {
-        if ( !$bp['bp_users_nav'] )
+        if ( !$bp->bp_users_nav )
             return false;
 
@@ -109 +109 @@
  * TEMPLATE TAG
  *
- * Uses the $bp['bp_users_nav'] global to render out the user navigation when viewing another user other than
+ * Uses the $bp->bp_users_nav global to render out the user navigation when viewing another user other than
  * yourself.
  *
@@ -119 +119 @@
 
     /* Sort the nav by key as the array has been put together in different locations */ 
-    $bp['bp_users_nav'] = bp_core_sort_nav_items( $bp['bp_users_nav'] );
-
-    foreach ( $bp['bp_users_nav'] as $user_nav_item ) { 
-        if ( $bp['current_component'] == $user_nav_item['css_id'] ) {
+    $bp->bp_users_nav = bp_core_sort_nav_items( $bp->bp_users_nav );
+
+    foreach ( $bp->bp_users_nav as $user_nav_item ) {   
+        if ( $bp->current_component == $user_nav_item['css_id'] ) {
             $selected = ' class="current"';
         } else {
@@ -145 +145 @@
     global $bp;
     
-    if ( $bp['bp_options_avatar'] == '' )
+    if ( empty( $bp->bp_options_avatar ) )
         return false;
     
@@ -164 +164 @@
     global $bp;
 
-    echo apply_filters( 'bp_get_options_avatar', $bp['bp_options_avatar'] );
+    echo apply_filters( 'bp_get_options_avatar', $bp->bp_options_avatar );
 }
 
@@ -170 +170 @@
     global $bp;
     
-    if ( $bp['bp_options_title'] == '' )
-        $bp['bp_options_title'] = __('Options', 'buddypress');
-    
-    echo apply_filters( 'bp_get_options_avatar', $bp['bp_options_title'] );
+    if ( empty( $bp->bp_options_title ) )
+        $bp->bp_options_title = __( 'Options', 'buddypress' );
+    
+    echo apply_filters( 'bp_get_options_avatar', $bp->bp_options_title );
 }
 
@@ -200 +200 @@
     
     if ( $width && $height )
-        echo apply_filters( 'bp_loggedinuser_avatar', bp_core_get_avatar( $bp['loggedin_userid'], 2, $width, $height ) );
+        echo apply_filters( 'bp_loggedinuser_avatar', bp_core_get_avatar( $bp->loggedin_user->id, 2, $width, $height ) );
     else
-        echo apply_filters( 'bp_loggedinuser_avatar', bp_core_get_avatar( $bp['loggedin_userid'], 2 ) );
+        echo apply_filters( 'bp_loggedinuser_avatar', bp_core_get_avatar( $bp->loggedin_user->id, 2 ) );
 }
 
@@ -209 +209 @@
     
     if ( $width && $height )
-        echo apply_filters( 'bp_get_options_avatar', bp_core_get_avatar( $bp['loggedin_userid'], 1, $width, $height ) );
+        echo apply_filters( 'bp_get_options_avatar', bp_core_get_avatar( $bp->loggedin_user->id, 1, $width, $height ) );
     else
-        echo apply_filters( 'bp_get_options_avatar', bp_core_get_avatar( $bp['loggedin_userid'], 1 ) );
+        echo apply_filters( 'bp_get_options_avatar', bp_core_get_avatar( $bp->loggedin_user->id, 1 ) );
 }
 
@@ -219 +219 @@
 
 function bp_is_home() {
-    global $bp, $current_blog, $doing_admin_bar;
-    
-    if ( is_user_logged_in() && $bp['loggedin_userid'] == $bp['current_userid'] )
+    global $bp;
+    
+    if ( is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
         return true;
         
@@ -231 +231 @@
     
     if ( !$user_id )
-        $user_id = $bp['current_userid'];
+        $user_id = $bp->displayed_user->id;
     
     if ( function_exists('xprofile_install') ) {
-        // First check the usermeta table for a easily fetchable value
-        //$data = get_usermeta( $user_id, 'bp_display_name' );
-
-        //if ( $data == '' ) {
-            $data = bp_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
-
-            if ( empty($data) ) {
-                $ud = get_userdata($user_id);
-                $data = $ud->display_name;
-            } else {
-                $data = ucfirst($data);
-            }
-            
-            // store this in usermeta for less expensive fetching.
-        //  update_usermeta( $user_id, 'bp_display_name', $data );
-        //}
+        $data = bp_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
+
+        if ( empty($data) ) {
+            $ud = get_userdata($user_id);
+            $data = $ud->display_name;
+        } else {
+            $data = ucfirst($data);
+        }
     } else {
         $ud = get_userdata($user_id);
@@ -265 +257 @@
     
     if ( !$user_id )
-        $user_id = $bp['current_userid'];
+        $user_id = $bp->displayed_user->id;
     
     $last_activity = bp_core_get_last_activity( get_usermeta( $user_id, 'last_activity' ), __('active %s ago', 'buddypress') );
@@ -277 +269 @@
 function bp_the_avatar() {
     global $bp;
-    echo apply_filters( 'bp_the_avatar', bp_core_get_avatar( $bp['current_userid'], 2 ) );
+    echo apply_filters( 'bp_the_avatar', bp_core_get_avatar( $bp->displayed_user->id, 2 ) );
 }
 
 function bp_the_avatar_thumbnail() {
     global $bp;
-    echo apply_filters( 'bp_the_avatar_thumbnail', bp_core_get_avatar( $bp['current_userid'], 1 ) );
+    echo apply_filters( 'bp_the_avatar_thumbnail', bp_core_get_avatar( $bp->displayed_user->id, 1 ) );
 }
 
@@ -288 +280 @@
     global $bp;
     
-    echo apply_filters( 'bp_the_avatar_thumbnail', $bp['current_domain'] );
+    echo apply_filters( 'bp_the_avatar_thumbnail', $bp->displayed_user->domain );
 }
 
@@ -322 +314 @@
         $youtext = ucfirst($youtext);
     
-    if ( $bp['current_userid'] == $bp['loggedin_userid'] ) {
+    if ( $bp->displayed_user->id == $bp->loggedin_user->id ) {
         if ( $echo )
             echo apply_filters( 'bp_word_or_name', $youtext );
@@ -328 +320 @@
             return apply_filters( 'bp_word_or_name', $youtext );
     } else {
-        $nametext = sprintf($nametext, $bp['current_fullname']);
+        $nametext = sprintf( $nametext, $bp->displayed_user->fullname );
         if ( $echo )
             echo apply_filters( 'bp_word_or_name', $nametext );
@@ -342 +334 @@
         $yourtext = ucfirst($yourtext);
     
-    if ( $bp['current_userid'] == $bp['loggedin_userid'] ) {
+    if ( $bp->displayed_user->id == $bp->loggedin_user->id ) {
         if ( $echo )
             echo apply_filters( 'bp_your_or_their', $yourtext );
@@ -358 +350 @@
     global $bp, $current_user;
     
-    if ( $link = bp_core_get_userlink( $bp['loggedin_userid'] ) ) {
+    if ( $link = bp_core_get_userlink( $bp->loggedin_user->id ) ) {
         echo apply_filters( 'bp_loggedinuser_link', $link );
     } else {
-        $ud = get_userdata($current_user->ID);
+        $ud = get_userdata($displayed_user->id);
         echo apply_filters( 'bp_loggedinuser_link', $ud->user_login );
     }
@@ -374 +366 @@
     global $bp, $is_member_page;
     
-    if ( $bp['current_component'] == NEWS_SLUG )
-        return true;
-        
-    if ( !$is_member_page && !in_array( $bp['current_component'], $bp['root_components'] ) )
-        return true;
-    
+    if ( $bp->current_component == HOME_BLOG_SLUG )
+        return true;
+
+    if ( !$is_member_page && !in_array( $bp->current_component, $bp->root_components ) )
+        return true;
+        
     return false;
 }
@@ -386 +378 @@
     global $bp;
     
-    if ( $bp['current_fullname'] != '' ) {
-        echo apply_filters( 'bp_page_title', strip_tags( $bp['current_fullname'] . ' &raquo; ' . ucwords($bp['current_component']) . ' &raquo; ' . $bp['bp_options_nav'][$bp['current_component']][$bp['current_action']]['name'] ) );
-    } else {
-        echo apply_filters( 'bp_page_title', strip_tags( ucwords($bp['current_component']) . ' &raquo; ' . ucwords($bp['bp_options_title']) . ' &raquo; ' . ucwords($bp['current_action']) ) );
+    if ( !empty( $bp->displayed_user->fullname ) ) {
+        echo apply_filters( 'bp_page_title', strip_tags( $bp->displayed_user->fullname . ' &raquo; ' . ucwords( $bp->current_component ) . ' &raquo; ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'] ) );
+    } else {
+        echo apply_filters( 'bp_page_title', strip_tags( ucwords( $bp->current_component ) . ' &raquo; ' . ucwords( $bp->bp_options_title ) . ' &raquo; ' . ucwords( $bp->current_action ) ) );
     }
 }
@@ -401 +393 @@
     global $bp;
 
-    if ( $bp['current_userid'] )
+    if ( $bp->displayed_user->id )
         return false;
 
-    if ( $page == $bp['current_component'] || $page == 'home' && $bp['current_component'] == $bp['default_component'] )
+    if ( $page == $bp->current_component || $page == 'home' && $bp->current_component == $bp->default_component )
         return true;
     
@@ -422 +414 @@
     if ( bp_has_custom_signup_page() ) {
         if ( $echo )
-            echo $bp['root_domain'] . '/' . REGISTER_SLUG;
-        else
-            return $bp['root_domain'] . '/' . REGISTER_SLUG;
-    } else {
-        if ( $echo )
-            echo $bp['root_domain'] . '/wp-signup.php';
-        else
-            return $bp['root_domain'] . '/wp-signup.php';
+            echo $bp->root_domain . '/' . REGISTER_SLUG;
+        else
+            return $bp->root_domain . '/' . REGISTER_SLUG;
+    } else {
+        if ( $echo )
+            echo $bp->root_domain . '/wp-signup.php';
+        else
+            return $bp->root_domain . '/wp-signup.php';
     }
 }
@@ -528 +520 @@
     
     if ( function_exists('friends_install') ) {
-        if ( friends_check_friendship( $bp['loggedin_userid'], $bp['current_userid'] ) )
+        if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
             return true;
         else
@@ -540 +532 @@
     global $bp;
 ?>
-    <li<?php if(bp_is_page('home')) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
-    <li<?php if(bp_is_page(HOME_BLOG_SLUG)) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
-    <li<?php if(bp_is_page(MEMBERS_SLUG)) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo 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>
+    <li<?php if ( bp_is_page( 'home' ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
+    <li<?php if ( bp_is_page( HOME_BLOG_SLUG ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
+    <li<?php if ( bp_is_page( MEMBERS_SLUG ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo 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>
+    <?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>
     <?php } ?>
 <?php
@@ -568 +560 @@
 function bp_current_user_id() {
     global $bp;
-    return apply_filters( 'bp_current_user_id', $bp['current_userid'] );
+    return apply_filters( 'bp_current_user_id', $bp->displayed_user->id );
 }
 
 function bp_user_fullname() {
     global $bp;
-    echo apply_filters( 'bp_user_fullname', $bp['current_fullname'] );
+    echo apply_filters( 'bp_user_fullname', $bp->displayed_user->fullname );
 }
 

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

@@ -94 +94 @@
     <?php if ( $users['users'] ) : ?>
         <div class="item-options" id="members-list-options">
-            <img id="ajax-loader-members" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
+            <img id="ajax-loader-members" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
             <a href="<?php echo site_url() . '/' . MEMBERS_SLUG ?>" id="newest-members" class="selected"><?php _e("Newest", 'buddypress') ?></a> | 
             <a href="<?php echo site_url() . '/' . MEMBERS_SLUG ?>" id="recently-active-members"><?php _e("Active", 'buddypress') ?></a> | 

trunk/bp-core/directories/bp-core-directory-members.php

@@ -2 +2 @@
 function bp_core_directory_members_setup() {
     global $bp, $current_blog;
-    
-    if ( $bp['current_component'] == MEMBERS_SLUG && $bp['current_action'] == '' ) {
+
+    if ( $bp->current_component == MEMBERS_SLUG && empty( $bp->current_action ) ) {
         add_action( 'bp_template_content', 'bp_core_directory_members_content' );
         add_action( 'bp_template_sidebar', 'bp_core_directory_members_sidebar' );
@@ -87 +87 @@
             <div id="member-dir-count" class="pag-count">
                 <?php echo sprintf( __( 'Viewing member %d to %d (%d total active members)', 'buddypress' ), $from_num, $to_num, $users['total'] ); ?> &nbsp;
-                <img id="ajax-loader-members" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+                <img id="ajax-loader-members" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
             </div>
             

trunk/bp-forums.php

@@ -19 +19 @@
     global $bp, $bbpress_live;
 
-    if ( get_usermeta( $bp['loggedin_userid'], 'bb_capabilities' ) == '' )
-        bp_forums_make_user_active_member( $bp['loggedin_userid'] );
+    if ( get_usermeta( $bp->loggedin_user->id, 'bb_capabilities' ) == '' )
+        bp_forums_make_user_active_member( $bp->loggedin_user->id );
     
-    $bp['version_numbers']['forums'] = BP_FORUMS_VERSION;
+    $bp->version_numbers->forums = BP_FORUMS_VERSION;
 }
 add_action( 'wp', 'bp_forums_setup', 3 );

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

@@ -265 +265 @@
     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 ) );
 ?>
-    <img id="ajax-loader-groups" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+    <img id="ajax-loader-groups" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
 <?php
 }
@@ -371 +371 @@
     global $is_single_group, $group_obj;
     
-    $topic_id = $bp['action_variables'][1];
+    $topic_id = $bp->action_variables[1];
 
     if ( is_numeric( $topic_id ) )
@@ -440 +440 @@
     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 ) );
 ?>
-    <img id="ajax-loader-groups" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+    <img id="ajax-loader-groups" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
 <?php
 }

trunk/bp-friends.php

@@ -29 +29 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
         
-    $sql[] = "CREATE TABLE ". $bp['friends']['table_name'] ." (
+    $sql[] = "CREATE TABLE {$bp->friends->table_name} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 initiator_user_id int(11) NOT NULL,
@@ -57 +57 @@
     global $bp, $wpdb;
     
-    $bp['friends'] = array(
-        'table_name' => $wpdb->base_prefix . 'bp_friends',
-        'image_base' => site_url( MUPLUGINDIR . '/bp-friends/images' ),
-        'format_activity_function' => 'friends_format_activity',
-        'slug'       => BP_FRIENDS_SLUG
-    );
-
-    $bp['version_numbers'][$bp['friends']['slug']] = BP_FRIENDS_VERSION;
+    $bp->friends->table_name = $wpdb->base_prefix . 'bp_friends';
+    $bp->friends->image_base = site_url( MUPLUGINDIR . '/bp-friends/images' );
+    $bp->friends->format_activity_function = 'friends_format_activity';
+    $bp->friends->slug = BP_FRIENDS_SLUG;
+
+    $bp->version_numbers->friends = BP_FRIENDS_VERSION;
 }
 add_action( 'wp', 'friends_setup_globals', 1 ); 
@@ -74 +72 @@
     if ( is_site_admin() ) {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['friends']['table_name'] . "%'") == false ) || ( get_site_option('bp-friends-db-version') < BP_FRIENDS_DB_VERSION )  )
+        if ( ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->friends->table_name}%'") == false ) || ( get_site_option('bp-friends-db-version') < BP_FRIENDS_DB_VERSION )  )
             friends_install();
     }
@@ -90 +88 @@
     
     /* Add 'Friends' to the main navigation */
-    bp_core_add_nav_item( __('Friends', 'buddypress'), $bp['friends']['slug'] );
-    bp_core_add_nav_default( $bp['friends']['slug'], 'friends_screen_my_friends', 'my-friends' );
-    
-    $friends_link = $bp['loggedin_domain'] . $bp['friends']['slug'] . '/';
+    bp_core_add_nav_item( __('Friends', 'buddypress'), $bp->friends->slug );
+    bp_core_add_nav_default( $bp->friends->slug, 'friends_screen_my_friends', 'my-friends' );
+    
+    $friends_link = $bp->loggedin_user->domain . $bp->friends->slug . '/';
     
     /* Add the subnav items to the friends nav item */
-    bp_core_add_subnav_item( $bp['friends']['slug'], 'my-friends', __('My Friends', 'buddypress'), $friends_link, 'friends_screen_my_friends', 'friends-my-friends' );
-    bp_core_add_subnav_item( $bp['friends']['slug'], 'requests', __('Requests', 'buddypress'), $friends_link, 'friends_screen_requests', false, bp_is_home() );
-    //bp_core_add_subnav_item( $bp['friends']['slug'], 'invite-friend', __('Invite Friends', 'buddypress'), $friends_link, 'friends_screen_invite_friends' );
-    
-    if ( $bp['current_component'] == $bp['friends']['slug'] ) {
+    bp_core_add_subnav_item( $bp->friends->slug, 'my-friends', __( 'My Friends', 'buddypress' ), $friends_link, 'friends_screen_my_friends', 'friends-my-friends' );
+    bp_core_add_subnav_item( $bp->friends->slug, 'requests', __( 'Requests', 'buddypress' ), $friends_link, 'friends_screen_requests', false, bp_is_home() );
+    
+    if ( $bp->current_component == $bp->friends->slug ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Friends', 'buddypress');
+            $bp->bp_options_title = __( 'My Friends', 'buddypress' );
         } else {
-            $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
-            $bp['bp_options_title'] = $bp['current_fullname']; 
+            $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+            $bp->bp_options_title = $bp->displayed_user->fullname; 
         }
     }
@@ -118 +115 @@
 
     // Delete any friendship acceptance notifications for the user when viewing a profile
-    bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'friends', 'friendship_accepted' );
+    bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'friends', 'friendship_accepted' );
 
     do_action( 'friends_screen_my_friends' );
@@ -128 +125 @@
     global $bp;
             
-    if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'accept' && is_numeric($bp['action_variables'][1]) ) {
-        
-        if ( friends_accept_friendship( $bp['action_variables'][1] ) ) {
-            bp_core_add_message( __('Friendship accepted', 'buddypress') );
+    if ( isset($bp->action_variables) && $bp->action_variables[0] == 'accept' && is_numeric($bp->action_variables[1]) ) {
+        
+        if ( friends_accept_friendship( $bp->action_variables[1] ) ) {
+            bp_core_add_message( __( 'Friendship accepted', 'buddypress' ) );
         } else {
-            bp_core_add_message( __('Friendship could not be accepted', 'buddypress'), 'error' );
+            bp_core_add_message( __( 'Friendship could not be accepted', 'buddypress' ), 'error' );
         }
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );
-        
-    } else if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'reject' && is_numeric($bp['action_variables'][1]) ) {
-        
-        if ( friends_reject_friendship( $bp['action_variables'][1] ) ) {
-            bp_core_add_message( __('Friendship rejected', 'buddypress') );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
+        
+    } else if ( isset($bp->action_variables) && $bp->action_variables[0] == 'reject' && is_numeric($bp->action_variables[1]) ) {
+        
+        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_add_message( __( 'Friendship could not be rejected', 'buddypress' ), 'error' );
         }   
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
     }
     
@@ -259 +256 @@
         case 'friendship_accepted':
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_friends_multiple_friendship_accepted_notification', '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/my-friends/newest" title="' . __( 'My Friends', 'buddypress' ) . '">' . sprintf( __('%d friends accepted your friendship requests'), (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'), (int)$total_items ) . '</a>', (int)$total_items );     
             } else {
                 $user_fullname = bp_core_global_user_fullname( $item_id );
@@ -269 +266 @@
         case 'friendship_request':
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_friends_multiple_friendship_request_notification', '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have %d pending friendship requests'), (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'), (int)$total_items ) . '</a>', $total_items );        
             } else {
                 $user_fullname = bp_core_global_user_fullname( $item_id );
                 $user_url = bp_core_get_userurl( $item_id );
-                return apply_filters( 'bp_friends_single_friendship_request_notification', '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have a friendship request from %s'), $user_fullname ) . '</a>', $user_fullname );
+                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'), $user_fullname ) . '</a>', $user_fullname );
             }   
         break;
@@ -286 +283 @@
     $friend_count = get_usermeta( $user_id, 'total_friend_count');
 
-    if ( $friend_count == '' )
+    if ( empty( $friend_count ) )
         return false;
     
@@ -406 +403 @@
     
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
     
     $friend_ids = friends_get_alphabetically( $user_id );
@@ -520 +517 @@
     
     // Remove the activity stream items
-    friends_delete_activity( array( 'item_id' => $friendship_id, 'component_name' => 'friends', 'component_action' => 'friendship_accepted', 'user_id' => $bp['current_userid'] ) );
+    friends_delete_activity( array( 'item_id' => $friendship_id, 'component_name' => 'friends', 'component_action' => 'friendship_accepted', 'user_id' => $bp->displayed_user->id ) );
     
     do_action( 'friends_friendship_deleted', $friendship_id, $initiator_userid, $friend_userid );

trunk/bp-friends/bp-friends-ajax.php

@@ -13 +13 @@
     global $bp;
 
-    if ( BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $_POST['fid'] ) == 'is_friend' ) {
-        if ( !friends_remove_friend( $bp['loggedin_userid'], $_POST['fid'] ) ) {
+    if ( BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) == 'is_friend' ) {
+        if ( !friends_remove_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
             echo __("Friendship could not be canceled.", 'buddypress');
         } else {
-            echo '<a id="friend-' . $_POST['fid'] . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/add-friend/' . $_POST['fid'] . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
+            echo '<a id="friend-' . $_POST['fid'] . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/add-friend/' . $_POST['fid'] . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
         }
-    } else if ( BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $_POST['fid'] ) == 'not_friends' ) {
-        if ( !friends_add_friend( $bp['loggedin_userid'], $_POST['fid'] ) ) {
+    } else if ( BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) == 'not_friends' ) {
+        if ( !friends_add_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
             echo __("Friendship could not be requested.", 'buddypress');
         } else {
-            echo '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '" class="requested">' . __( 'Friendship Requested', 'buddypres' ) . '</a>';
-            //echo '<a id="friend-' . $_POST['fid'] . '" class="remove" rel="remove" title="' . __( 'Remove Friend', 'buddypress' ) . '" href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/remove-friend/' . $_POST['fid'] . '">' . __( 'Remove Friend', 'buddypress' ) . '</a>';
+            echo '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '" class="requested">' . __( 'Friendship Requested', 'buddypres' ) . '</a>';
+            //echo '<a id="friend-' . $_POST['fid'] . '" class="remove" rel="remove" title="' . __( 'Remove Friend', 'buddypress' ) . '" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/remove-friend/' . $_POST['fid'] . '">' . __( 'Remove Friend', 'buddypress' ) . '</a>';
         }
     } else {

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

@@ -27 +27 @@
         global $wpdb, $bp, $creds;
         
-        if ( $friendship = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['friends']['table_name'] . " WHERE id = %d", $this->id ) ) ) {
+        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->friend_user_id = $friendship->friend_user_id;
@@ -36 +36 @@
         
         // if running from ajax.
-        if ( !$bp['current_userid'] )
-            $bp['current_userid'] = $creds['current_userid'];
+        if ( !$bp->displayed_user->id )
+            $bp->displayed_user->id = $creds['current_userid'];
         
         if ( $this->populate_friend_details ) {
-            if ( $this->friend_user_id == $bp['current_userid'] ) {
+            if ( $this->friend_user_id == $bp->displayed_user->id ) {
                 $this->friend = new BP_Core_User( $this->initiator_user_id );
             } else {
@@ -53 +53 @@
         if ( $this->id ) {
             // Update
-            $result = $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['friends']['table_name'] . " SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = FROM_UNIXTIME(%d) ) WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
+            $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = FROM_UNIXTIME(%d) ) WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
         } else {
             // Save
-            $result = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['friends']['table_name'] . " ( initiator_user_id, friend_user_id, is_confirmed, is_limited, date_created ) VALUES ( %d, %d, %d, %d, FROM_UNIXTIME(%d) )", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created ) );
+            $result = $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->friends->table_name} ( initiator_user_id, friend_user_id, is_confirmed, is_limited, date_created ) VALUES ( %d, %d, %d, %d, FROM_UNIXTIME(%d) )", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created ) );
             $this->id = $wpdb->insert_id;
         }
@@ -66 +66 @@
         global $wpdb, $bp;
         
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['friends']['table_name'] . " WHERE id = %d", $this->id ) );
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d", $this->id ) );
     }
     
@@ -82 +82 @@
         }
 
-        $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" ) );
+        $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++ ) {
@@ -105 +105 @@
         }
         
-        return $wpdb->get_col( $wpdb->prepare( "SELECT id FROM " . $bp['friends']['table_name'] . " $friend_sql $oc_sql" ) );
+        return $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->friends->table_name} $friend_sql $oc_sql" ) );
     }
     
@@ -111 +111 @@
         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 ) );
+        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 ) );
     }
     
@@ -120 +120 @@
            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 ) );
+        $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 )
@@ -133 +133 @@
         
         if ( !$user_id )
-            $user_id = $bp['loggedin_userid'];
+            $user_id = $bp->loggedin_user->id;
         
         like_escape($filter);
@@ -149 +149 @@
         // filter the user_ids based on the search criteria.
         if ( function_exists('xprofile_install') ) {
-            $sql = $wpdb->prepare( "SELECT DISTINCT user_id FROM " . $bp['profile']['table_name_data'] . " WHERE user_id IN ($fids) AND value LIKE '$filter%%'" );
+            $sql = $wpdb->prepare( "SELECT DISTINCT user_id FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%'" );
         } else {
             $sql = $wpdb->prepare( "SELECT DISTINCT user_id FROM $usermeta_table WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%'" );
@@ -160 +160 @@
 
         // Get the total number of friendships
-        $total_friends = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['friends']['table_name'] . " WHERE (friend_user_id IN ($filtered_fids) AND initiator_user_id = %d) OR (initiator_user_id IN ($filtered_fids) AND friend_user_id = %d)", $user_id, $user_id ) );
+        $total_friends = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->friends->table_name} WHERE (friend_user_id IN ($filtered_fids) AND initiator_user_id = %d) OR (initiator_user_id IN ($filtered_fids) AND friend_user_id = %d)", $user_id, $user_id ) );
         
         return array( 'friends' => $filtered_friends, 'total' => $total_friends );
@@ -171 +171 @@
             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 ) );
+        $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 ) {
@@ -193 +193 @@
         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_userid'] ) );
+        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 ) );
     }
     
@@ -199 +199 @@
         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_userid'] ) );
+        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 ) );
     }
     
@@ -214 +214 @@
         // filter the user_ids based on the search criteria.
         if ( function_exists('xprofile_install') ) {
-            $sql = $wpdb->prepare( "SELECT DISTINCT d.user_id as id FROM " . $bp['profile']['table_name_data'] . " d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
+            $sql = $wpdb->prepare( "SELECT DISTINCT d.user_id as id FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
         } else {
             $sql = $wpdb->prepare( "SELECT DISTINCT user_id as id FROM $usermeta_table WHERE meta_value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
@@ -236 +236 @@
         // filter the user_ids based on the search criteria.
         if ( function_exists('xprofile_install') ) {
-            $sql = $wpdb->prepare( "SELECT DISTINCT count(d.user_id) FROM " . $bp['profile']['table_name_data'] . " d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%'" );
+            $sql = $wpdb->prepare( "SELECT DISTINCT count(d.user_id) FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%'" );
         } else {
             $sql = $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM $usermeta_table WHERE meta_value LIKE '$filter%%'" );
@@ -255 +255 @@
             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 ) );
+        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 ) );
     }
     
@@ -261 +261 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM " . $bp['friends']['table_name'] . " WHERE (friend_user_id = %d || initiator_user_id = %d) && is_confirmed = 1 ORDER BY rand() LIMIT %d", $user_id, $user_id, $total_friends );
+        $sql = $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} WHERE (friend_user_id = %d || initiator_user_id = %d) && is_confirmed = 1 ORDER BY rand() LIMIT %d", $user_id, $user_id, $total_friends );
         $results = $wpdb->get_results($sql);
 
@@ -298 +298 @@
         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 ) );
+        return $wpdb->get_row( $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} WHERE id = %d", $friendship_id ) );
     }
     
@@ -304 +304 @@
         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 ) ); 
+        $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 ) );
+        $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-cssjs.php

@@ -9 +9 @@
     global $bp;
 
-    if ( $bp['current_component'] == $bp['friends']['slug'] )
+    if ( $bp->current_component == $bp->friends->slug )
         wp_enqueue_script( 'bp-friends-js', site_url( MUPLUGINDIR . '/bp-friends/js/general.js' ) );
 }

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

@@ -20 +20 @@
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : 10;
 
-        if ( $bp['current_action'] == 'my-friends' && $_POST['friend-search-box'] != '' ) {
+        if ( $bp->current_action == 'my-friends' && $_POST['friend-search-box'] != '' ) {
             
             // Search results
-            $this->friendships = friends_search_friends( $_POST['friend-search-box'], $bp['current_userid'], $this->pag_num, $this->pag_page );
+            $this->friendships = friends_search_friends( $_POST['friend-search-box'], $bp->displayed_user->id, $this->pag_num, $this->pag_page );
             $this->total_friend_count = (int)$this->friendships['total'];
             $this->friendships = $this->friendships['friends'];
         
-        } else if ( $bp['current_action'] == 'requests' ) {
+        } else if ( $bp->current_action == 'requests' ) {
         
             // Friendship Requests
-            $this->friendships = friends_get_friendship_requests( $bp['current_userid'] );
+            $this->friendships = friends_get_friendship_requests( $bp->displayed_user->id );
             $this->total_friend_count = $this->friendships['total'];
             $this->friendships = $this->friendships['requests'];
 
         } else {
-            $order = $bp['action_variables'][0];
+            $order = $bp->action_variables[0];
             
             if ( $order == 'newest' ) {
-                $this->friendships = friends_get_newest( $bp['current_userid'], $this->pag_num, $this->pag_page );
+                $this->friendships = friends_get_newest( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
             } else if ( $order == 'alphabetically' ) {
-                $this->friendships = friends_get_alphabetically( $bp['current_userid'], $this->pag_num, $this->pag_page );              
+                $this->friendships = friends_get_alphabetically( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                
             } else {
-                $this->friendships = friends_get_recently_active( $bp['current_userid'], $this->pag_num, $this->pag_page ); 
+                $this->friendships = friends_get_recently_active( $bp->displayed_user->id, $this->pag_num, $this->pag_page );   
             }
             
@@ -102 +102 @@
         $this->friendship = $this->next_friendship();
         
-        if ( $bp['current_action'] == 'requests' ) {
+        if ( $bp->current_action == 'requests' ) {
             $this->friendship = new BP_Friends_Friendship( $this->friendship );
         } else {
@@ -117 +117 @@
     global $bp, $friends_template;
 
-    $friends_template = new BP_Friendship_Template( $bp['current_userid'] );
+    $friends_template = new BP_Friendship_Template( $bp->displayed_user->id );
     
     return $friends_template->has_friendships();
@@ -248 +248 @@
     global $friends_template, $bp;
     
-    echo apply_filters( 'bp_friend_accept_request_link', $bp['loggedin_domain'] . $bp['friends']['slug'] . '/requests/accept/' . $friends_template->friendship->id );
+    echo apply_filters( 'bp_friend_accept_request_link', $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friends_template->friendship->id );
 }
 
@@ -254 +254 @@
     global $friends_template, $bp;
     
-    echo apply_filters( 'bp_friend_reject_request_link', $bp['loggedin_domain'] . $bp['friends']['slug'] . '/requests/reject/' . $friends_template->friendship->id );   
+    echo apply_filters( 'bp_friend_reject_request_link', $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friends_template->friendship->id );   
 }
 
@@ -265 +265 @@
     global $friends_template, $bp;
 
-    $action = $bp['current_domain'] . $bp['friends']['slug'] . '/my-friends/search/';
+    $action = $bp->displayed_user->domain . $bp->friends->slug . '/my-friends/search/';
     $label = __( 'Filter Friends', 'buddypress' );
 ?>
     <form action="<?php echo $action ?>" id="friend-search-form" method="post">
-        <label for="friend-search-box" id="friend-search-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp['friends']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></label>
+        <label for="friend-search-box" id="friend-search-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp->friends->image_base ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></label>
         <input type="search" name="friend-search-box" id="friend-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
         <?php if ( function_exists('wp_nonce_field') )
             wp_nonce_field('friend_search' );
         ?>
-        <input type="hidden" name="initiator" id="initiator" value="<?php echo $bp['current_userid'] ?>" />
+        <input type="hidden" name="initiator" id="initiator" value="<?php echo $bp->displayed_user->id ?>" />
     </form>
 <?php
@@ -281 +281 @@
 function bp_friend_all_friends_link() {
     global $bp;
-    echo apply_filters( 'bp_friend_all_friends_link', $bp['current_domain'] . 'my-friends/all-friends' );
+    echo apply_filters( 'bp_friend_all_friends_link', $bp->displayed_user->domain . 'my-friends/all-friends' );
 }
 
 function bp_friend_latest_update_link() {
     global $bp;
-    echo apply_filters( 'bp_friend_latest_update_link', $bp['current_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['current_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['current_domain'] . 'my-friends/status-updates' );  
+    echo apply_filters( 'bp_friend_recent_status_link', $bp->displayed_user->domain . 'my-friends/status-updates' );    
 }
 
@@ -307 +307 @@
             $potential_friend_id = $friends_template->friendship->friend->id;
         else if ( !$potential_friend_id && !$friends_template->friendship->friend )
-            $potential_friend_id = $bp['current_userid'];
-
-        if ( $bp['loggedin_userid'] == $potential_friend_id )
+            $potential_friend_id = $bp->displayed_user->id;
+
+        if ( $bp->loggedin_user->id == $potential_friend_id )
             return false;
 
-        $friend_status = BP_Friends_Friendship::check_is_friend( $bp['loggedin_userid'], $potential_friend_id );
+        $friend_status = BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $potential_friend_id );
 
         echo '<div class="friendship-button ' . $friend_status . '" id="friendship-button-' . $potential_friend_id . '">';
         if ( $friend_status == 'pending' ) {
-            echo '<a class="requested" href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
+            echo '<a class="requested" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
         } else if ( $friend_status == 'is_friend') {
-            echo '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/remove-friend/' . $potential_friend_id . '" title="' . __('Cancel Friendship', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="remove" class="remove">' . __('Cancel Friendship', 'buddypress') . '</a>';
+            echo '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/remove-friend/' . $potential_friend_id . '" title="' . __('Cancel Friendship', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="remove" class="remove">' . __('Cancel Friendship', 'buddypress') . '</a>';
         } else {
-            echo '<a href="' . $bp['loggedin_domain'] . $bp['friends']['slug'] . '/add-friend/' . $potential_friend_id . '" title="' . __('Add Friend', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="add" class="add">' . __('Add Friend', 'buddypress') . '</a>';
+            echo '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/add-friend/' . $potential_friend_id . '" title="' . __('Add Friend', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="add" class="add">' . __('Add Friend', 'buddypress') . '</a>';
         }
         echo '</div>';
@@ -333 +333 @@
     global $bp, $create_group_step, $completed_to_step;
 ?>
-    <li<?php if ( !isset($bp['action_variables'][0]) || $bp['action_variables'][0] == 'recently-active' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['friends']['slug'] ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-    <li<?php if ( $bp['action_variables'][0] == 'newest' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['friends']['slug'] ?>/my-friends/newest"><?php _e( 'Newest', 'buddypress' ) ?></a></li>
-    <li<?php if ( $bp['action_variables'][0] == 'alphabetically' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['friends']['slug'] ?>/my-friends/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+    <li<?php if ( !isset($bp->action_variables[0]) || $bp->action_variables[0] == 'recently-active' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+    <li<?php if ( $bp->action_variables[0] == 'newest' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/newest"><?php _e( 'Newest', 'buddypress' ) ?></a></li>
+    <li<?php if ( $bp->action_variables[0] == 'alphabetically' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
 <?php
     do_action( 'friends_header_tabs' );
@@ -343 +343 @@
     global $bp;
     
-    $current_filter = $bp['action_variables'][0];
+    $current_filter = $bp->action_variables[0];
     
     switch ( $current_filter ) {
@@ -361 +361 @@
     global $bp;
     
-    $friend_ids = BP_Friends_Friendship::get_random_friends( $bp['current_userid'] );
+    $friend_ids = BP_Friends_Friendship::get_random_friends( $bp->displayed_user->id );
 ?>  
     <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['current_userid'] ) ?>)  <a href="<?php echo $bp['current_domain'] . $bp['friends']['slug'] ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></h4>
+        <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 ) ?>)  <a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></h4>
         
         <?php if ( $friend_ids ) { ?>

trunk/bp-groups.php

@@ -30 +30 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     
-    $sql[] = "CREATE TABLE ". $bp['groups']['table_name'] ." (
+    $sql[] = "CREATE TABLE {$bp->groups->table_name} (
             id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
             creator_id int(11) NOT NULL,
@@ -51 +51 @@
            ) {$charset_collate};";
     
-    $sql[] = "CREATE TABLE ". $bp['groups']['table_name_members'] ." (
+    $sql[] = "CREATE TABLE {$bp->groups->table_name_members} (
             id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
             group_id int(11) NOT NULL,
@@ -72 +72 @@
            ) {$charset_collate};";
 
-    $sql[] = "CREATE TABLE ". $bp['groups']['table_name_groupmeta'] ." (
+    $sql[] = "CREATE TABLE {$bp->groups->table_name_groupmeta} (
             id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
             group_id int(11) NOT NULL,
@@ -93 +93 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     
-    $sql[] = "CREATE TABLE ". $bp['groups']['table_name_wire'] ." (
+    $sql[] = "CREATE TABLE {$bp->groups->table_name_wire} (
             id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
             item_id int(11) NOT NULL,
@@ -121 +121 @@
         global $bp;
     
-    $bp['groups'] = array(
-        'table_name' => $wpdb->base_prefix . 'bp_groups',
-        'table_name_members' => $wpdb->base_prefix . 'bp_groups_members',
-        'table_name_groupmeta' => $wpdb->base_prefix . 'bp_groups_groupmeta',
-        'image_base' => site_url( MUPLUGINDIR . '/bp-groups/images' ),
-        'format_activity_function' => 'groups_format_activity',
-        'slug'       => BP_GROUPS_SLUG
-    );
-    
+    $bp->groups->table_name = $wpdb->base_prefix . 'bp_groups';
+    $bp->groups->table_name_members = $wpdb->base_prefix . 'bp_groups_members';
+    $bp->groups->table_name_groupmeta = $wpdb->base_prefix . 'bp_groups_groupmeta';
+    $bp->groups->image_base = site_url( MUPLUGINDIR . '/bp-groups/images' );
+    $bp->groups->format_activity_function = 'groups_format_activity';
+    $bp->groups->slug = BP_GROUPS_SLUG;
+
     if ( function_exists('bp_wire_install') )
-        $bp['groups']['table_name_wire'] = $wpdb->base_prefix . 'bp_groups_wire';
-    
-    $bp['groups']['forbidden_names'] = array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' );
-    $bp['version_numbers'][$bp['groups']['slug']] = BP_GROUPS_VERSION;
-
+        $bp->groups->table_name_wire = $wpdb->base_prefix . 'bp_groups_wire';
+    
+    $bp->groups->forbidden_names = array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' );
+    $bp->version_numbers->groups = BP_GROUPS_VERSION;
+    
     return $bp;
 }
@@ -152 +150 @@
     if ( is_site_admin() ) {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['groups']['table_name'] . "%'") == false ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION )  )
+        if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->groups->table_name . "%'") == false ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION )  )
             groups_install();
             
-        if ( ( function_exists('bp_wire_install') && $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['groups']['table_name_wire'] . "%'") == false ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION ) )
+        if ( ( function_exists('bp_wire_install') && $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->groups->table_name_wire . "%'") == false ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION ) )
             groups_wire_install();
     }
@@ -182 +180 @@
     global $group_obj, $is_single_group;
     
-    if ( $group_id = BP_Groups_Group::group_exists($bp['current_action']) ) {
+    if ( $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
         /* This is a single group page. */
         $is_single_group = true;
@@ -189 +187 @@
         /* Using "item" not "group" for generic support in other components. */
         if ( is_site_admin() )
-            $bp['is_item_admin'] = 1;
+            $bp->is_item_admin = 1;
         else
-            $bp['is_item_admin'] = groups_is_user_admin( $bp['loggedin_userid'], $group_obj->id );
+            $bp->is_item_admin = groups_is_user_admin( $bp->loggedin_user->id, $group_obj->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_userid'], $group_obj->id );
+        if ( !$bp->is_item_admin )
+            $bp->is_item_mod = groups_is_user_mod( $bp->loggedin_user->id, $group_obj->id );
         
         /* Is the logged in user a member of the group? */
-        $is_member = ( groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) ? true : false;
+        $is_member = ( groups_is_user_member( $bp->loggedin_user->id, $group_obj->id ) ) ? true : false;
     
         /* Should this group be visible to the logged in user? */
@@ -205 +203 @@
 
     /* Add 'Groups' to the main navigation */
-    bp_core_add_nav_item( __('Groups', 'buddypress'), $bp['groups']['slug'] );
-    
-    if ( $bp['current_userid'] )
-        bp_core_add_nav_default( $bp['groups']['slug'], 'groups_screen_my_groups', 'my-groups' );
-        
-    $groups_link = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/';
+    bp_core_add_nav_item( __('Groups', 'buddypress'), $bp->groups->slug );
+    
+    if ( $bp->displayed_user->id )
+        bp_core_add_nav_default( $bp->groups->slug, 'groups_screen_my_groups', 'my-groups' );
+        
+    $groups_link = $bp->loggedin_user->domain . $bp->groups->slug . '/';
     
     /* Add the subnav items to the groups nav item */
-    bp_core_add_subnav_item( $bp['groups']['slug'], 'my-groups', __('My Groups', 'buddypress'), $groups_link, 'groups_screen_my_groups', 'my-groups-list' );
-    bp_core_add_subnav_item( $bp['groups']['slug'], 'create', __('Create a Group', 'buddypress'), $groups_link, 'groups_screen_create_group', false, bp_is_home() );
-    bp_core_add_subnav_item( $bp['groups']['slug'], 'invites', __('Invites', 'buddypress'), $groups_link, 'groups_screen_group_invites', false, bp_is_home() );
-    
-    if ( $bp['current_component'] == $bp['groups']['slug'] ) {
+    bp_core_add_subnav_item( $bp->groups->slug, 'my-groups', __('My Groups', 'buddypress'), $groups_link, 'groups_screen_my_groups', 'my-groups-list' );
+    bp_core_add_subnav_item( $bp->groups->slug, 'create', __('Create a Group', 'buddypress'), $groups_link, 'groups_screen_create_group', false, bp_is_home() );
+    bp_core_add_subnav_item( $bp->groups->slug, 'invites', __('Invites', 'buddypress'), $groups_link, 'groups_screen_group_invites', false, bp_is_home() );
+    
+    if ( $bp->current_component == $bp->groups->slug ) {
         
         if ( bp_is_home() && !$is_single_group ) {
             
-            $bp['bp_options_title'] = __('My Groups', 'buddypress');
+            $bp->bp_options_title = __('My Groups', 'buddypress');
             
         } else if ( !bp_is_home() && !$is_single_group ) {
 
-            $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
-            $bp['bp_options_title'] = $bp['current_fullname'];
+            $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+            $bp->bp_options_title = $bp->displayed_user->fullname;
             
         } else if ( $is_single_group ) {
@@ -234 +232 @@
             /* 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_item'] = $bp['current_action'];
-            $bp['current_action'] = $bp['action_variables'][0];
-            array_shift($bp['action_variables']);
+            $bp->current_item = $bp->current_action;
+            $bp->current_action = $bp->action_variables[0];
+            array_shift($bp->action_variables);
                                     
-            $bp['bp_options_title'] = bp_create_excerpt( $group_obj->name, 1 );
-            $bp['bp_options_avatar'] = '<img src="' . $group_obj->avatar_thumb . '" alt="Group Avatar Thumbnail" />';
-            
-            $group_link = $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug . '/';
+            $bp->bp_options_title = bp_create_excerpt( $group_obj->name, 1 );
+            $bp->bp_options_avatar = '<img src="' . $group_obj->avatar_thumb . '" alt="Group Avatar Thumbnail" />';
+            
+            $group_link = $bp->root_domain . '/' . $bp->groups->slug . '/' . $group_obj->slug . '/';
             
             // If this is a private or hidden group, does the user have access?
             if ( $group_obj->status == 'private' || $group_obj->status == 'hidden' ) {
-                if ( groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) && is_user_logged_in() )
+                if ( groups_is_user_member( $bp->loggedin_user->id, $group_obj->id ) && is_user_logged_in() )
                     $has_access = true;
                 else
@@ -254 +252 @@
 
             // Reset the existing subnav items
-            bp_core_reset_subnav_items($bp['groups']['slug']);
-            
-            bp_core_add_nav_default( $bp['groups']['slug'], 'groups_screen_group_home', 'home' );
-            bp_core_add_subnav_item( $bp['groups']['slug'], 'home', __('Home', 'buddypress'), $group_link, 'groups_screen_group_home', 'group-home' );
+            bp_core_reset_subnav_items($bp->groups->slug);
+            
+            bp_core_add_nav_default( $bp->groups->slug, 'groups_screen_group_home', 'home' );
+            bp_core_add_subnav_item( $bp->groups->slug, 'home', __('Home', 'buddypress'), $group_link, 'groups_screen_group_home', '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_add_subnav_item( $bp['groups']['slug'], 'admin', __('Admin', 'buddypress'), $group_link , 'groups_screen_group_admin', 'group-admin', ( $bp['is_item_admin'] + (int)$bp['is_item_mod'] ) );
+            if ( $bp->is_item_mod || $bp->is_item_admin )
+                bp_core_add_subnav_item( $bp->groups->slug, 'admin', __('Admin', 'buddypress'), $group_link , 'groups_screen_group_admin', 'group-admin', ( $bp->is_item_admin + (int)$bp->is_item_mod ) );
             
             // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
-            if ( !$has_access && !groups_check_for_membership_request( $bp['loggedin_userid'], $group_obj->id ) )
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'request-membership', __('Request Membership', 'buddypress'), $group_link , 'groups_screen_group_request_membership', 'request-membership' );
+            if ( !$has_access && !groups_check_for_membership_request( $bp->loggedin_user->id, $group_obj->id ) )
+                bp_core_add_subnav_item( $bp->groups->slug, 'request-membership', __('Request Membership', 'buddypress'), $group_link , 'groups_screen_group_request_membership', 'request-membership' );
             
             if ( $has_access && $group_obj->enable_forum && function_exists('bp_forums_setup') )
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'forum', __('Forum', 'buddypress'), $group_link , 'groups_screen_group_forum', 'group-forum', $is_visible);
+                bp_core_add_subnav_item( $bp->groups->slug, 'forum', __('Forum', 'buddypress'), $group_link , 'groups_screen_group_forum', 'group-forum', $is_visible);
 
             if ( $has_access && $group_obj->enable_wire && function_exists('bp_wire_install') )
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'wire', __('Wire', 'buddypress'), $group_link, 'groups_screen_group_wire', 'group-wire', $is_visible );
+                bp_core_add_subnav_item( $bp->groups->slug, 'wire', __('Wire', 'buddypress'), $group_link, 'groups_screen_group_wire', 'group-wire', $is_visible );
 
             if ( $has_access && $group_obj->enable_photos && function_exists('bp_gallery_install') )
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'photos', __('Photos', 'buddypress'), $group_link, 'groups_screen_group_photos', 'group-photos', $is_visible );
+                bp_core_add_subnav_item( $bp->groups->slug, 'photos', __('Photos', 'buddypress'), $group_link, 'groups_screen_group_photos', 'group-photos', $is_visible );
 
             if ( $has_access )
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'members', __('Members', 'buddypress'), $group_link, 'groups_screen_group_members', 'group-members', $is_visible );
-            
-            if ( is_user_logged_in() && groups_is_user_member( $bp['loggedin_userid'], $group_obj->id ) ) {
+                bp_core_add_subnav_item( $bp->groups->slug, 'members', __('Members', 'buddypress'), $group_link, 'groups_screen_group_members', 'group-members', $is_visible );
+            
+            if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $group_obj->id ) ) {
                 if ( function_exists('friends_install') )
-                    bp_core_add_subnav_item( $bp['groups']['slug'], 'send-invites', __('Send Invites', 'buddypress'), $group_link, 'groups_screen_group_invite', 'group-invite', $is_member );
+                    bp_core_add_subnav_item( $bp->groups->slug, 'send-invites', __('Send Invites', 'buddypress'), $group_link, 'groups_screen_group_invite', 'group-invite', $is_member );
                 
-                bp_core_add_subnav_item( $bp['groups']['slug'], 'leave-group', __('Leave Group', 'buddypress'), $group_link, 'groups_screen_group_leave', 'group-leave', $is_member );
+                bp_core_add_subnav_item( $bp->groups->slug, 'leave-group', __('Leave Group', 'buddypress'), $group_link, 'groups_screen_group_leave', 'group-leave', $is_member );
             }
         }
@@ -297 +295 @@
     global $bp;
     
-    bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'member_promoted_to_mod' );
-    bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'member_promoted_to_admin' );
+    bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'member_promoted_to_mod' );
+    bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'member_promoted_to_admin' );
 
     do_action( 'groups_screen_my_groups' );
@@ -308 +306 @@
     global $bp;
     
-    $group_id = $bp['action_variables'][1];
-    
-    if ( isset($bp['action_variables']) && in_array( 'accept', $bp['action_variables'] ) && is_numeric($group_id) ) {
-        
-        if ( !groups_accept_invite( $bp['loggedin_userid'], $group_id ) ) {
+    $group_id = $bp->action_variables[1];
+    
+    if ( isset($bp->action_variables) && in_array( 'accept', $bp->action_variables ) && is_numeric($group_id) ) {
+        
+        if ( !groups_accept_invite( $bp->loggedin_user->id, $group_id ) ) {
             bp_core_add_message( __('Group invite could not be accepted', 'buddypress'), 'error' );             
         } else {
@@ -321 +319 @@
         }
 
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );
-        
-    } else if ( isset($bp['action_variables']) && in_array( 'reject', $bp['action_variables'] ) && is_numeric($group_id) ) {
-        
-        if ( !groups_reject_invite( $group_id, $bp['loggedin_userid'] ) ) {
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
+        
+    } else if ( isset($bp->action_variables) && in_array( 'reject', $bp->action_variables ) && is_numeric($group_id) ) {
+        
+        if ( !groups_reject_invite( $group_id, $bp->loggedin_user->id ) ) {
             bp_core_add_message( __('Group invite could not be rejected', 'buddypress'), 'error' );                         
         } else {            
@@ -331 +329 @@
         }
 
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );
+        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_userid'], 'groups', 'group_invite' );
+    bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'group_invite' );
 
     do_action( 'groups_screen_group_invites', $group_id );
@@ -349 +347 @@
     $reset_steps = false;
     
-    if ( !$create_group_step = $bp['action_variables'][1] ) {
+    if ( !$create_group_step = $bp->action_variables[1] ) {
         $create_group_step = '1';
         $completed_to_step = 0;
@@ -380 +378 @@
             if ( !$group_id = groups_create_group( $create_group_step, $_SESSION['group_obj_id'] ) ) {
                 bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
-                bp_core_redirect( $bp['loggedin_domain'] . $bp['groups']['slug'] . '/create/step/' . $create_group_step );
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $create_group_step );
             } else {
                 $create_group_step++;
@@ -403 +401 @@
         if ( isset($_GET['new']) ) {
             // Delete group request notifications for the user
-            bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'membership_request_accepted' );
-            bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'membership_request_rejected' );
-            bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'member_promoted_to_mod' );
-            bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'member_promoted_to_admin' );
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'membership_request_accepted' );
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'membership_request_rejected' );
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'member_promoted_to_mod' );
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'member_promoted_to_admin' );
         }   
 
@@ -419 +417 @@
     
     if ( $is_single_group ) {
-        $topic_id = $bp['action_variables'][1];
+        $topic_id = $bp->action_variables[1];
         $forum_id = groups_get_groupmeta( $group_obj->id, 'forum_id' );
         
@@ -454 +452 @@
     global $is_single_group, $group_obj;
     
-    $wire_action = $bp['action_variables'][0];
+    $wire_action = $bp->action_variables[0];
         
     if ( $is_single_group ) {
-        if ( $wire_action == 'post' && BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) {
+        if ( $wire_action == 'post' && BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group_obj->id ) ) {
 
             if ( !groups_new_wire_post( $group_obj->id, $_POST['wire-post-textarea'] ) ) {
@@ -465 +463 @@
             }
 
-            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
+            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
                 bp_core_redirect( bp_group_permalink( $group_obj, false ) );
             } else {
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
-            }
-    
-        } else if ( $wire_action == 'delete' && BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group_obj->id ) ) {
-            $wire_message_id = $bp['action_variables'][1];
-
-            if ( !groups_delete_wire_post( $wire_message_id, $bp['groups']['table_name_wire'] ) ) {
+                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp->wire->slug );
+            }
+    
+        } else if ( $wire_action == 'delete' && BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group_obj->id ) ) {
+            $wire_message_id = $bp->action_variables[1];
+
+            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 {
@@ -480 +478 @@
             }
             
-            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
+            if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
                 bp_core_redirect( bp_group_permalink( $group_obj, false ) );
             } else {
-                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
-            }
-        
-        } else if ( ( !$wire_action || $bp['action_variables'][1] == 'latest' ) ) {
+                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp->wire->slug );
+            }
+        
+        } else if ( ( !$wire_action || $bp->action_variables[1] == 'latest' ) ) {
             bp_core_load_template( 'groups/wire' );
         } else {
@@ -520 +518 @@
     
     if ( $is_single_group ) {
-        if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'send' ) {
+        if ( isset($bp->action_variables) && $bp->action_variables[0] == 'send' ) {
             // Send the invites.
             groups_send_invites($group_obj);
@@ -540 +538 @@
     
     if ( $is_single_group ) {
-        if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'yes' ) {
+        if ( isset($bp->action_variables) && $bp->action_variables[0] == 'yes' ) {
             
             // Check if the user is the group admin first.
-            if ( groups_is_group_admin( $bp['loggedin_userid'], $group_obj->id ) ) {
+            if ( groups_is_group_admin( $bp->loggedin_user->id, $group_obj->id ) ) {
                 bp_core_add_message(  __('As the only group administrator, you cannot leave this group.', 'buddypress'), 'error' );
                 bp_core_redirect( bp_group_permalink( $group_obj, false) );
@@ -554 +552 @@
             } else {
                 bp_core_add_message( __('You left the group successfully.', 'buddypress') );
-                bp_core_redirect( $bp['loggedin_domain'] . $bp['groups']['slug'] );
-            }
-            
-        } else if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'no' ) {
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug );
+            }
+            
+        } else if ( isset($bp->action_variables) && $bp->action_variables[0] == 'no' ) {
             
             bp_core_redirect( bp_group_permalink( $group_obj, false) );
@@ -581 +579 @@
         // If the user has submitted a request, send it.
         if ( isset( $_POST['group-request-send']) ) {
-            if ( !groups_send_membership_request( $bp['loggedin_userid'], $group_obj->id ) ) {
+            if ( !groups_send_membership_request( $bp->loggedin_user->id, $group_obj->id ) ) {
                 bp_core_add_message( __( 'There was an error sending your group membership request, please try again.', 'buddypress' ), 'error' );
             } else {
@@ -598 +596 @@
     global $bp, $group_obj;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && !$bp['action_variables'] ) {
+    if ( $bp->current_component == $bp->groups->slug && !$bp->action_variables ) {
         
         do_action( 'groups_screen_group_admin', $group_obj->id );
@@ -610 +608 @@
     global $bp, $group_obj;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'edit-details' ) {
-    
-        if ( $bp['is_item_admin'] || $bp['is_item_mod']  ) {
+    if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'edit-details' ) {
+    
+        if ( $bp->is_item_admin || $bp->is_item_mod  ) {
         
             // If the edit form has been submitted, save the edited details
@@ -624 +622 @@
                 do_action( 'groups_group_details_edited', $group_obj->id );
                 
-                bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/edit-details' );
+                bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/edit-details' );
             }
 
@@ -640 +638 @@
     global $bp, $group_obj;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'group-settings' ) {
-        
-        if ( !$bp['is_item_admin'] )
+    if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'group-settings' ) {
+        
+        if ( !$bp->is_item_admin )
             return false;
         
@@ -661 +659 @@
             do_action( 'groups_group_settings_edited', $group_obj->id );
             
-            bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/group-settings' );
+            bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/group-settings' );
         }
 
@@ -674 +672 @@
     global $bp, $group_obj;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'group-avatar' ) {
-        
-        if ( !$bp['is_item_admin'] )
+    if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'group-avatar' ) {
+        
+        if ( !$bp->is_item_admin )
             return false;
         
@@ -706 +704 @@
             do_action( 'groups_group_avatar_edited', $group_obj->id );
 
-            bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/group-avatar' );
+            bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/group-avatar' );
         }
         
@@ -719 +717 @@
     global $bp, $group_obj;
 
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'manage-members' ) {
-        
-        if ( !$bp['is_item_admin'] )
+    if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'manage-members' ) {
+        
+        if ( !$bp->is_item_admin )
             return false;
         
-        if ( $bp['action_variables'][1] == 'promote' && is_numeric( $bp['action_variables'][2] ) ) {
-            $user_id = $bp['action_variables'][2];
+        if ( $bp->action_variables[1] == 'promote' && is_numeric( $bp->action_variables[2] ) ) {
+            $user_id = $bp->action_variables[2];
             
             // Promote a user.
@@ -736 +734 @@
             do_action( 'groups_promoted_member', $user_id, $group_obj->id );
             
-            bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/manage-members' );
-        }
-        
-        if ( $bp['action_variables'][1] == 'demote' && is_numeric( $bp['action_variables'][2] ) ) {
-            $user_id = $bp['action_variables'][2];
+            bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/manage-members' );
+        }
+        
+        if ( $bp->action_variables[1] == 'demote' && is_numeric( $bp->action_variables[2] ) ) {
+            $user_id = $bp->action_variables[2];
             
             // Demote a user.
@@ -751 +749 @@
             do_action( 'groups_demoted_member', $user_id, $group_obj->id );
             
-            bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/manage-members' );
-        }
-        
-        if ( $bp['action_variables'][1] == 'ban' && is_numeric( $bp['action_variables'][2] ) ) {
-            $user_id = $bp['action_variables'][2];
+            bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/manage-members' );
+        }
+        
+        if ( $bp->action_variables[1] == 'ban' && is_numeric( $bp->action_variables[2] ) ) {
+            $user_id = $bp->action_variables[2];
             
             // Ban a user.
@@ -766 +764 @@
             do_action( 'groups_banned_member', $user_id, $group_obj->id );
             
-            bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/manage-members' );
-        }
-        
-        if ( $bp['action_variables'][1] == 'unban' && is_numeric( $bp['action_variables'][2] ) ) {
-            $user_id = $bp['action_variables'][2];
+            bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/manage-members' );
+        }
+        
+        if ( $bp->action_variables[1] == 'unban' && is_numeric( $bp->action_variables[2] ) ) {
+            $user_id = $bp->action_variables[2];
             
             // Remove a ban for user.
@@ -781 +779 @@
             do_action( 'groups_unbanned_member', $user_id, $group_obj->id );
             
-            bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/manage-members' );
+            bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/manage-members' );
         }
 
@@ -795 +793 @@
     global $bp, $group_obj;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'membership-requests' ) {
-        
-        if ( !$bp['is_item_admin'] || $group_obj->status == 'public' )
+    if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'membership-requests' ) {
+        
+        if ( !$bp->is_item_admin || $group_obj->status == 'public' )
             return false;
         
         // Remove any screen notifications
-        bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'new_membership_request' );
-        
-        $request_action = $bp['action_variables'][1];
-        $membership_id = $bp['action_variables'][2];
+        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'groups', 'new_membership_request' );
+        
+        $request_action = $bp->action_variables[1];
+        $membership_id = $bp->action_variables[2];
 
         if ( isset($request_action) && isset($membership_id) ) {
@@ -829 +827 @@
             do_action( 'groups_group_request_managed', $group_obj->id, $request_action, $membership_id );
             
-            bp_core_redirect( site_url() . '/' . $bp['current_component'] . '/' . $bp['current_item'] . '/admin/membership-requests' );
+            bp_core_redirect( site_url() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests' );
         }
 
@@ -842 +840 @@
     global $bp, $group_obj;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'delete-group' ) {
-        
-        if ( !$bp['is_item_admin'] )
+    if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'delete-group' ) {
+        
+        if ( !$bp->is_item_admin )
             return false;
         
@@ -853 +851 @@
             } else {
                 bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) );
-                bp_core_redirect( site_url() . '/' . $bp['groups']['slug'] . '/' );
+                bp_core_redirect( site_url() . '/' . $bp->groups->slug . '/' );
             }
 
             do_action( 'groups_group_deleted', $_POST['group-id'] );
 
-            bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] );
+            bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component );
         } else {
             do_action( 'groups_screen_group_admin_delete_group', $group_obj->id );
@@ -923 +921 @@
     global $is_single_group, $group_obj;    
 
-    if ( !$is_single_group || $bp['current_component'] != $bp['groups']['slug'] || $bp['current_action'] != 'join' )
+    if ( !$is_single_group || $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_userid'], $group_obj->id ) && !groups_is_user_banned( $bp['loggedin_userid'], $group_obj->id ) ) {
+    if ( !groups_is_user_member( $bp->loggedin_user->id, $group_obj->id ) && !groups_is_user_banned( $bp->loggedin_user->id, $group_obj->id ) ) {
         if ( !groups_join_group($group_obj->id) ) {
             bp_core_add_message( __('There was an error joining the group.', 'buddypress'), 'error' );
@@ -1008 +1006 @@
         break;
         case 'new_wire_post':
-            $wire_post = new BP_Wire_Post( $bp['groups']['table_name_wire'], $item_id );
+            $wire_post = new BP_Wire_Post( $bp->groups->table_name_wire, $item_id );
             $group = new BP_Groups_Group( $wire_post->item_id );
 
@@ -1112 +1110 @@
             
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests'), (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'), (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 );
@@ -1125 +1123 @@
             
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . MEMBERS_SLUG . '/' . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests'), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );      
+                return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . MEMBERS_SLUG . '/' . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests'), (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 );
@@ -1139 +1137 @@
             
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups'), (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'), (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 );
@@ -1152 +1150 @@
             
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups'), (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'), (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 );
@@ -1165 +1163 @@
             
             if ( (int)$total_items > 1 ) {
-                return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations'), (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'), (int)$total_items ) . '</a>', $total_items );     
             } else {
-                return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s'), $group->name ) . '</a>', $group->name );
+                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'), $group->name ) . '</a>', $group->name );
             }   
         break;
@@ -1207 +1205 @@
     global $bp;
     
-    $groups = BP_Groups_Member::get_group_ids( $bp['current_userid'], $pag_num, $pag_page );
+    $groups = BP_Groups_Member::get_group_ids( $bp->displayed_user->id, $pag_num, $pag_page );
 
     return array( 'groups' => $groups['ids'], 'total' => $groups['total'] );
@@ -1292 +1290 @@
         bp_core_render_avatar_upload_form( '', true );
     } else {
-        bp_core_render_avatar_cropper( $original, $canvas, null, null, false, $bp['loggedin_domain'] );
+        bp_core_render_avatar_cropper( $original, $canvas, null, null, false, $bp->loggedin_user->domain );
     }
 }
@@ -1306 +1304 @@
     global $bp;
     
-    $src = $bp['root_domain'] . '/';
+    $src = $bp->root_domain . '/';
 
     $thumb_href = str_replace( ABSPATH, $src, stripslashes( $avatars['v1_out'] ) );
@@ -1317 +1315 @@
     global $bp;
 
-    $src = $bp['root_domain'] . '/';
+    $src = $bp->root_domain . '/';
 
     $path = str_replace( $src, ABSPATH, stripslashes( $avatar ) );
@@ -1348 +1346 @@
             case '1':
                 if ( $_POST['group-name'] != '' && $_POST['group-desc'] != '' ) {
-                    $group_obj->creator_id = $bp['loggedin_userid'];
+                    $group_obj->creator_id = $bp->loggedin_user->id;
                     $group_obj->name = stripslashes($_POST['group-name']);
                     $group_obj->description = stripslashes($_POST['group-desc']);
@@ -1368 +1366 @@
 
                     // Save the creator as the group administrator
-                    $admin = new BP_Groups_Member( $bp['loggedin_userid'], $group_obj->id );
+                    $admin = new BP_Groups_Member( $bp->loggedin_user->id, $group_obj->id );
                     $admin->is_admin = 1;
                     $admin->user_title = __('Group Admin', 'buddypress');
@@ -1410 +1408 @@
                 } else {
                     /* Create the forum if enable_forum = 1 */
-                    if ( function_exists( 'bp_forums_setup' ) && groups_get_groupmeta( $group_obj->id, 'forum_id' ) == '' ) {
+                    if ( function_exists( 'bp_forums_setup' ) && '' == groups_get_groupmeta( $group_obj->id, 'forum_id' ) ) {
                         groups_new_group_forum();
                     }
@@ -1471 +1469 @@
     global $bp;
     
-    if ( in_array( $slug, $bp['groups']['forbidden_names'] ) ) {
+    if ( in_array( $slug, $bp->groups->forbidden_names ) ) {
         $slug = $slug . '-' . rand();
     }
@@ -1574 +1572 @@
     $invite->user_id = $user_id;
     $invite->date_modified = time();
-    $invite->inviter_id = $bp['loggedin_userid'];
+    $invite->inviter_id = $bp->loggedin_user->id;
     $invite->is_confirmed = 0;
     
@@ -1635 +1633 @@
     
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
     
     return BP_Groups_Member::get_invites( $user_id );
@@ -1644 +1642 @@
     
     // Send friend invites.
-    $invited_users = groups_get_invites_for_group( $bp['loggedin_userid'], $group_obj->id );
+    $invited_users = groups_get_invites_for_group( $bp->loggedin_user->id, $group_obj->id );
 
     for ( $i = 0; $i < count( $invited_users ); $i++ ) {
@@ -1652 +1650 @@
     }
     
-    groups_notification_group_invites( $group_obj->id, $invited_users, $bp['loggedin_userid'] );
+    groups_notification_group_invites( $group_obj->id, $invited_users, $bp->loggedin_user->id );
     
     do_action( 'groups_send_invites', $group_obj->id, $invited_users );
@@ -1665 +1663 @@
     
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
     
     // Admins cannot leave a group, that is until promotion to admin support is implemented.
@@ -1675 +1673 @@
         return false;
 
-    do_action( 'groups_leave_group', $group_id, $bp['loggedin_userid'] );
+    do_action( 'groups_leave_group', $group_id, $bp->loggedin_user->id );
 
     /* Modify group member count */
@@ -1687 +1685 @@
     
     if ( !$user_id )
-        $user_id = $bp['loggedin_userid'];
+        $user_id = $bp->loggedin_user->id;
     
     $new_member = new BP_Groups_Member;
@@ -1708 +1706 @@
     groups_update_groupmeta( $group_id, 'last_activity', time() );
 
-    do_action( 'groups_join_group', $group_id, $bp['loggedin_userid'] );
+    do_action( 'groups_join_group', $group_id, $bp->loggedin_user->id );
 
     return true;
@@ -1763 +1761 @@
     global $bp;
     
-    if ( $group_name == '' || $group_desc == '' )
+    if ( empty( $group_name ) || empty( $group_desc ) )
         return false;
         
@@ -1797 +1795 @@
     /* If forums have been enabled, and a forum does not yet exist, we need to create one. */
     if ( $group->enable_forum ) {
-        if ( function_exists( 'bp_forums_setup' ) && groups_get_groupmeta( $group->id, 'forum_id' ) == '' ) {
+        if ( function_exists( 'bp_forums_setup' ) && '' == groups_get_groupmeta( $group->id, 'forum_id' ) ) {
             groups_new_group_forum( $group->id, $group->name, $group->description );
         }
@@ -1810 +1808 @@
     global $bp;
     
-    if ( !$bp['is_item_admin'] )
+    if ( !$bp->is_item_admin )
         return false;
         
@@ -1823 +1821 @@
     global $bp;
     
-    if ( !$bp['is_item_admin'] )
+    if ( !$bp->is_item_admin )
         return false;
         
@@ -1836 +1834 @@
     global $bp;
     
-    if ( !$bp['is_item_admin'] )
+    if ( !$bp->is_item_admin )
         return false;
         
@@ -1849 +1847 @@
     global $bp;
     
-    if ( !$bp['is_item_admin'] )
+    if ( !$bp->is_item_admin )
         return false;
         
@@ -1926 +1924 @@
     global $bp, $wpdb;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && isset( $_GET['random'] ) ) {
+    if ( $bp->current_component == $bp->groups->slug && isset( $_GET['random'] ) ) {
         $group = groups_get_random_group();
 
-        bp_core_redirect( $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $group['groups'][0]->slug );
+        bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/' . $group['groups'][0]->slug );
     }
 }
@@ -1938 +1936 @@
     
     // Check the user is the group admin.
-    if ( !$bp['is_item_admin'] )
+    if ( !$bp->is_item_admin )
         return false;
     
@@ -1948 +1946 @@
     
     // Remove the activity stream item
-    groups_delete_activity( array( 'item_id' => $group_id, 'component_name' => 'groups', 'component_action' => 'created_group', 'user_id' => $bp['loggedin_userid'] ) );
+    groups_delete_activity( array( 'item_id' => $group_id, 'component_name' => 'groups', 'component_action' => 'created_group', 'user_id' => $bp->loggedin_user->id ) );
     
     do_action( 'groups_delete_group', $group_id );
@@ -1997 +1995 @@
 
     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 AND meta_value = %s", $group_id, $meta_key, $meta_value ) );
     } else {
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
     }
     
@@ -2028 +2026 @@
         //  $metas = array($user->$meta_key);
         //else
-        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key) );
+        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key) );
     } else {
-        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d", $group_id) );
+        $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d", $group_id) );
     }
 
@@ -2066 +2064 @@
     }
 
-    $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
+    $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp->groups->table_name_groupmeta . " WHERE group_id = %d AND meta_key = %s", $group_id, $meta_key ) );
 
     if ( !$cur ) {
-        $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['groups']['table_name_groupmeta'] . " ( group_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $group_id, $meta_key, $meta_value ) );
+        $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp->groups->table_name_groupmeta . " ( group_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $group_id, $meta_key, $meta_value ) );
     } else if ( $cur->meta_value != $meta_value ) {
-        $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['groups']['table_name_groupmeta'] . " SET meta_value = %s WHERE group_id = %d AND meta_key = %s", $meta_value, $group_id, $meta_key ) );
+        $wpdb->query( $wpdb->prepare( "UPDATE " . $bp->groups->table_name_groupmeta . " SET meta_value = %s WHERE group_id = %d AND meta_key = %s", $meta_value, $group_id, $meta_key ) );
     } else {
         return false;
@@ -2088 +2086 @@
 function groups_force_buddypress_theme( $template ) {
     global $current_component, $current_action;
-    global $is_member_page;
-    
+    global $is_member_page, $bp;
+
     $groups_bp = groups_setup_globals(true);
     
-    if ( $current_component != $groups_bp['groups']['slug'] )
+    if ( $current_component != $groups_bp->groups->slug )
         return $template;
-        
+    
     $member_theme = get_site_option('active-member-theme');
     
-    if ( $member_theme == '' )
+    if ( empty($member_theme) )
         $member_theme = 'buddypress-member';
     
@@ -2104 +2102 @@
     bp_core_set_uri_globals();
 
-    if ( $current_component == $groups_bp['groups']['slug'] )
-        $is_single_group = BP_Groups_Group::group_exists( $current_action, $groups_bp['groups']['table_name'] );
+    if ( $current_component == $groups_bp->groups->slug )
+        $is_single_group = BP_Groups_Group::group_exists( $current_action, $groups_bp->groups->table_name );
     
     if ( $is_single_group ) {
@@ -2123 +2121 @@
     global $bp, $is_single_group, $is_member_page, $current_component;
 
-    if ( $current_component != $bp['groups']['slug'] )
+    if ( $current_component != $bp->groups->slug )
         return $stylesheet;
 
     $member_theme = get_site_option('active-member-theme');
     
-    if ( $member_theme == '' )
+    if ( empty( $member_theme ) )
         $member_theme = 'buddypress-member';
     

trunk/bp-groups/bp-groups-ajax.php

@@ -8 +8 @@
         return false;
     
-    if ( !groups_is_user_admin( $bp['loggedin_userid'], $_POST['group_id'] ) )
-        return false;
-    
-    if ( !friends_check_friendship( $bp['loggedin_userid'], $_POST['friend_id'] ) )
+    if ( !groups_is_user_admin( $bp->loggedin_user->id, $_POST['group_id'] ) )
+        return false;
+    
+    if ( !friends_check_friendship( $bp->loggedin_user->id, $_POST['friend_id'] ) )
         return false;
     
@@ -25 +25 @@
         echo '<span class="activity">' . sprintf( __( 'active %s ago', 'buddypress' ), $user->last_active ) . '</span>';
         echo '<div class="action">
-                <a class="remove" href="' . $bp['loggedin_domain'] . $bp['groups']['slug'] . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id . '" id="uid-' . $user->id . '">' . __( 'Remove Invite', 'buddypress' ) . '</a> 
+                <a class="remove" href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id . '" id="uid-' . $user->id . '">' . __( 'Remove Invite', 'buddypress' ) . '</a> 
               </div>';
         echo '</li>';
@@ -230 +230 @@
         <div id="group-dir-count" class="pag-count">
             <?php echo sprintf( __( 'Viewing group %d to %d (%d total active groups)', 'buddypress' ), $from_num, $to_num, $groups['total'] ); ?> &nbsp;
-            <img id="ajax-loader-groups" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+            <img id="ajax-loader-groups" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
         </div>
     
@@ -287 +287 @@
     global $bp;
 
-    if ( groups_is_user_banned( $bp['loggedin_userid'], $_POST['gid'] ) )
+    if ( groups_is_user_banned( $bp->loggedin_user->id, $_POST['gid'] ) )
         return false;
     
@@ -296 +296 @@
         return false;
     
-    if ( !groups_is_user_member( $bp['loggedin_userid'], $group->id ) ) {
+    if ( !groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
     
         if ( $group->status == 'public' ) {
@@ -305 +305 @@
             }           
         } else if ( $group->status == 'private' ) {
-            if ( !groups_send_membership_request( $bp['loggedin_userid'], $group->id ) ) {
+            if ( !groups_send_membership_request( $bp->loggedin_user->id, $group->id ) ) {
                 _e( 'Error requesting membership', 'buddypress' );  
             } else {

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

@@ -41 +41 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name'] . " WHERE id = %d", $this->id );
+        $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} WHERE id = %d", $this->id );
         $group = $wpdb->get_row($sql);
 
@@ -93 +93 @@
         if ( $this->id ) {
             $sql = $wpdb->prepare( 
-                "UPDATE " . $bp['groups']['table_name'] . " SET 
+                "UPDATE {$bp->groups->table_name} SET 
                     creator_id = %d, 
                     name = %s, 
@@ -129 +129 @@
         } else {
             $sql = $wpdb->prepare( 
-                "INSERT INTO " . $bp['groups']['table_name'] . " ( 
+                "INSERT INTO {$bp->groups->table_name} ( 
                     creator_id,
                     name,
@@ -185 +185 @@
         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 ) );
+        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 ) );
     }
         
@@ -217 +217 @@
         
         for ( $i = 0; $i < count($this->user_dataset); $i++ ) {
-            if ( $this->user_dataset[$i]->user_id == $bp['loggedin_userid'] ) {
+            if ( $this->user_dataset[$i]->user_id == $bp->loggedin_user->id ) {
                 return true;
             }
@@ -247 +247 @@
         // 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'] );
+            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 ) ) )
+        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name} WHERE id = %d", $this->id ) ) )
             return false;
 
@@ -264 +264 @@
         
         if ( !$table_name )
-            $table_name = $bp['groups']['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_var( $wpdb->prepare( "SELECT id FROM {$table_name} WHERE slug = %s", $slug ) );
     }
 
@@ -278 +278 @@
     function get_invites( $user_id, $group_id ) {
         global $wpdb, $bp;
-        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 ) );
+        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 ) );
     }
     
@@ -290 +290 @@
         
         // Get all the group ids for the current user's groups.
-        $gids = BP_Groups_Member::get_group_ids( $bp['current_userid'], false, false, false, true );
+        $gids = BP_Groups_Member::get_group_ids( $bp->displayed_user->id, false, false, false, true );
 
         if ( !$gids['groups'] )
@@ -297 +297 @@
         $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})" ) );
+        $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 );
@@ -317 +317 @@
         }
         
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM " . $bp['groups']['table_name'] . " WHERE status != 'hidden' AND name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' {$order_sql} {$pag_sql}" ) );
-        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name'] . " WHERE status != 'hidden' AND name LIKE '%%$filter%%' OR description LIKE '%%$filter%%'" ) );
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE status != 'hidden' AND name LIKE '%%$filter%%' OR description LIKE '%%$filter%%' {$order_sql} {$pag_sql}" ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name} WHERE status != 'hidden' AND name LIKE '%%$filter%%' OR description LIKE '%%$filter%%'" ) );
         
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -326 +326 @@
         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 ) );     
     }
     
@@ -332 +332 @@
         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 ) );       
     }
     
@@ -338 +338 @@
         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 )
@@ -349 +349 @@
         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 ) );                       
     }
     
@@ -357 +357 @@
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $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 ) );
-        }
-        
-        $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 ) );
+        }
+        
+        $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 ) );
 
         return array( 'requests' => $paged_requests, 'total' => $total_requests );
@@ -370 +370 @@
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name'] . " WHERE status != 'hidden' ORDER BY date_created DESC", $limit ) );
-        }
-        
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM " . $bp['groups']['table_name'] . " WHERE status != 'hidden' ORDER BY date_created DESC {$pag_sql}" ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->groups->table_name} WHERE status != 'hidden' ORDER BY date_created DESC", $limit ) );
+        }
+        
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE status != 'hidden' ORDER BY date_created DESC {$pag_sql}" ) );
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -383 +383 @@
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $total_groups = count( $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 AND g.status != 'hidden' AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC", $limit ) ) );
-        }
-        
-        $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 AND g.status != 'hidden' AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}", $limit ) );
+            $total_groups = count( $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 AND g.status != 'hidden' AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC", $limit ) ) );
+        }
+        
+        $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 AND g.status != 'hidden' AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}", $limit ) );
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -396 +396 @@
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $total_groups = count( $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 AND g.status != 'hidden' AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC", $limit ) ) );
-        }
-            
-        $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 AND g.status != 'hidden' AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}", $limit ) );
+            $total_groups = count( $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 AND g.status != 'hidden' AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC", $limit ) ) );
+        }
+            
+        $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 AND g.status != 'hidden' AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}", $limit ) );
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -423 +423 @@
             switch ( $sort_by ) {
                 default:
-                    $sql = $wpdb->prepare( "SELECT g.id as g.group_id, g.slug FROM " . $bp['groups']['table_name'] . " {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );  
+                    $sql = $wpdb->prepare( "SELECT g.id as g.group_id, g.slug FROM {$bp->groups->table_name} {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );    
                     break;
                 case 'members':
-                    $sql = $wpdb->prepare( "SELECT g.id as group_id, g.slug 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 g.id as group_id, g.slug 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 g.id as group_id, g.slug 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 g.id as group_id, g.slug 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 id as group_id, slug FROM " . $bp['groups']['table_name'] . " {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );    
+            $sql = $wpdb->prepare( "SELECT id as group_id, slug FROM {$bp->groups->table_name} {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );  
         }
 
@@ -452 +452 @@
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $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" ) );
+            $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}" ) );
+        $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 );
@@ -469 +469 @@
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $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}" ) );        
+            $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 );
@@ -515 +515 @@
         
         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 );
+            $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 );
+            $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name_members} WHERE id = %d", $this->id );
             
         $member = $wpdb->get_row($sql);
@@ -544 +544 @@
         
         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 );
-        } else {
-            $sql = $wpdb->prepare( "INSERT INTO " . $bp['groups']['table_name_members'] . " ( user_id, group_id, inviter_id, is_admin, is_mod, is_banned, user_title, date_modified, is_confirmed, comments, invite_sent ) VALUES ( %d, %d, %d, %d, %d, %d, %s, FROM_UNIXTIME(%d), %d, %s, %d )", $this->user_id, $this->group_id, $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 );
+            $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 );
+        } else {
+            $sql = $wpdb->prepare( "INSERT INTO {$bp->groups->table_name_members} ( user_id, group_id, inviter_id, is_admin, is_mod, is_banned, user_title, date_modified, is_confirmed, comments, invite_sent ) VALUES ( %d, %d, %d, %d, %d, %d, %s, FROM_UNIXTIME(%d), %d, %s, %d )", $this->user_id, $this->group_id, $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 );
         }
 
@@ -617 +617 @@
         global $wpdb, $bp;
         
-        $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 ) );
+        $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;
@@ -630 +630 @@
         // 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 ) );   
-        } 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 ); 
-            $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 ) );
+            $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 ); 
+            $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 ) );
         }
         
@@ -653 +653 @@
         // If the user is logged in and viewing their own groups, we can show hidden and private groups
         if ( bp_is_home() ) {
-            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0 AND is_confirmed = 1 ORDER BY date_modified ASC {$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 AND is_confirmed = 1 ORDER BY date_modified ASC", $user_id ) );
-        } else {
-            $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 AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 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 AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY date_modified ASC", $user_id ) ); 
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0 AND is_confirmed = 1 ORDER BY date_modified ASC {$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 AND is_confirmed = 1 ORDER BY date_modified ASC", $user_id ) );
+        } else {
+            $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 AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 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 AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY date_modified ASC", $user_id ) ); 
         }
                 
@@ -671 +671 @@
         // If the user is logged in and viewing their own groups, we can show hidden and private groups
         if ( bp_is_home() ) {
-            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM " . $bp['groups']['table_name_members'] . " m, " . $bp['groups']['table_name_groupmeta'] . " gm WHERE m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 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, " . $bp['groups']['table_name_groupmeta'] . " gm WHERE m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC", $user_id ) );
-        } else {
-            $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'] . " g ON m.group_id = g.id LEFT JOIN " . $bp['groups']['table_name_groupmeta'] . " gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 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 LEFT JOIN " . $bp['groups']['table_name'] . " g ON m.group_id = g.id LEFT JOIN " . $bp['groups']['table_name_groupmeta'] . " gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC", $user_id ) ); 
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name_groupmeta} gm WHERE m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 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, {$bp->groups->table_name_groupmeta} gm WHERE m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC", $user_id ) );
+        } else {
+            $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} g ON m.group_id = g.id LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 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 LEFT JOIN {$bp->groups->table_name} g ON m.group_id = g.id LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC", $user_id ) );   
         }
         
@@ -689 +689 @@
         // If the user is logged in and viewing their own groups, we can show hidden and private groups
         if ( bp_is_home() ) {
-            $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 WHERE gm.meta_key = 'last_activity' AND user_id = %d AND inviter_id = 0 AND 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 WHERE gm.meta_key = 'last_activity' AND user_id = %d AND inviter_id = 0 AND is_banned = 0 ORDER BY gm.meta_value DESC {$pag_sql}", $user_id ) );
-        } else {
-            $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 LEFT JOIN  " . $bp['groups']['table_name'] . " g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity' AND g.status != 'hidden' 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 LEFT JOIN " . $bp['groups']['table_name'] . " g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity' AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY gm.meta_value DESC", $user_id ) );  
+            $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 WHERE gm.meta_key = 'last_activity' AND user_id = %d AND inviter_id = 0 AND 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 WHERE gm.meta_key = 'last_activity' AND user_id = %d AND inviter_id = 0 AND is_banned = 0 ORDER BY gm.meta_value DESC {$pag_sql}", $user_id ) );
+        } else {
+            $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 LEFT JOIN  {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity' AND g.status != 'hidden' 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 LEFT JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity' AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY gm.meta_value DESC", $user_id ) );    
         }
 
@@ -707 +707 @@
         // If the user is logged in and viewing their own groups, we can show hidden and private groups
         if ( bp_is_home() ) {
-            $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'] . " g ON m.group_id = g.id WHERE 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 LEFT JOIN " . $bp['groups']['table_name'] . " g ON m.group_id = g.id WHERE m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC", $user_id ) );
-        } else {
-            $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 AND g.status != 'hidden' 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 AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC", $user_id ) );   
+            $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} g ON m.group_id = g.id WHERE 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 LEFT JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC", $user_id ) );
+        } else {
+            $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 AND g.status != 'hidden' 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 AND g.status != 'hidden' AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC", $user_id ) );   
         }
         
@@ -725 +725 @@
         // If the user is logged in and viewing their own groups, we can show hidden and private groups
         if ( bp_is_home() ) {
-            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0 AND is_admin = 1 ORDER BY date_modified ASC {$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 AND is_admin = 1 ORDER BY date_modified ASC", $user_id ) );
-        } else {
-            $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 AND g.status != 'hidden' 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 AND g.status != 'hidden' 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 ) ); 
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0 AND is_admin = 1 ORDER BY date_modified ASC {$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 AND is_admin = 1 ORDER BY date_modified ASC", $user_id ) );
+        } else {
+            $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 AND g.status != 'hidden' 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 AND g.status != 'hidden' 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 ) ); 
         }
         
@@ -743 +743 @@
         // If the user is logged in and viewing their own groups, we can show hidden and private groups
         if ( bp_is_home() ) {
-            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT group_id FROM " . $bp['groups']['table_name_members'] . " WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0 AND is_mod = 1 ORDER BY date_modified ASC {$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 AND is_mod = 1 ORDER BY date_modified ASC", $user_id ) );
-        } else {
-            $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 AND g.status != 'hidden' 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 AND g.status != 'hidden' 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 ) );   
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND inviter_id = 0 AND is_banned = 0 AND is_mod = 1 ORDER BY date_modified ASC {$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 AND is_mod = 1 ORDER BY date_modified ASC", $user_id ) );
+        } else {
+            $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 AND g.status != 'hidden' 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 AND g.status != 'hidden' 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 ) );   
         }
         
@@ -757 +757 @@
         
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
+            $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 ) );            
-        } 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(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 ) );            
         }
     }
@@ -769 +769 @@
         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 ) );
+        $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;
@@ -780 +780 @@
             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 ) );       
     }
     
@@ -789 +789 @@
             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 ) );
+        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 ) );
     }
     
@@ -798 +798 @@
             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 ) );
+        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 ) );
     }
     
@@ -807 +807 @@
             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 ) );   
     }
     
@@ -816 +816 @@
             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 ) );
+        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 ) );
     }
     
@@ -825 +825 @@
             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 ) );    
     }
     
@@ -833 +833 @@
         // 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 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 ) );         
         }
     }
@@ -842 +842 @@
         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 ) );
+        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 ) );
     }
     
@@ -848 +848 @@
         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 ) );
+        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 ) );
     }
     
@@ -863 +863 @@
             $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 ) );
+        $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 )
@@ -871 +871 @@
             $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 ) );
+            $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 );
@@ -879 +879 @@
         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 ) );      
     }
 }

trunk/bp-groups/bp-groups-cssjs.php

@@ -9 +9 @@
     global $bp;
 
-    if ( $bp['current_component'] == $bp['groups']['slug'] )
+    if ( $bp->current_component == $bp->groups->slug )
         wp_enqueue_script( 'bp-groups-js', site_url( MUPLUGINDIR . '/bp-groups/js/general.js' ) );
 }
@@ -23 +23 @@
     global $bp, $create_group_step;
     
-    if ( $create_group_step == '3' || ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'group-avatar' ) ) {
+    if ( $create_group_step == '3' || ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'group-avatar' ) ) {
         wp_enqueue_script('jquery');
         wp_enqueue_script('prototype');

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

@@ -7 +7 @@
         return false;
     
-    $wire_post = new BP_Wire_Post( $bp['groups']['table_name_wire'], $wire_post_id );
+    $wire_post = new BP_Wire_Post( $bp->groups->table_name_wire, $wire_post_id );
     $group = new BP_Groups_Group( $group_id, false, true );
     
@@ -24 +24 @@
         $to = $ud->user_email;
 
-        $wire_link = site_url() . '/' . $bp['groups']['slug'] . '/' . $group->slug . '/wire';
-        $group_link = site_url() . '/' . $bp['groups']['slug'] . '/' . $group->slug;
+        $wire_link = site_url() . '/' . $bp->groups->slug . '/' . $group->slug . '/wire';
+        $group_link = site_url() . '/' . $bp->groups->slug . '/' . $group->slug;
         $settings_link = site_url() . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/settings/notifications';
 
@@ -65 +65 @@
         $to = $ud->user_email;
 
-        $group_link = site_url() . '/' . $bp['groups']['slug'] . '/' . $group->slug;
+        $group_link = site_url() . '/' . $bp->groups->slug . '/' . $group->slug;
         $settings_link = site_url() . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/settings/notifications';
 
@@ -239 +239 @@
         $settings_link = site_url() . '/' . MEMBERS_SLUG . '/' . $ud->user_login . '/settings/notifications';
         $invited_link = site_url() . '/' . MEMBERS_SLUG . '/' . $invited_ud->user_login;
-        $invites_link = $invited_link . '/' . $bp['groups']['slug'] . '/invites';
+        $invites_link = $invited_link . '/' . $bp->groups->slug . '/invites';
         
         // Set up and send the message

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

@@ -28 +28 @@
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $groups_per_page;
         
-        if ( ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] == '' ) || ( !$bp['current_action'] && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] == '' ) ) {
-
-            $order = $bp['action_variables'][0];
+        if ( ( $bp->current_action == 'my-groups' && empty( $_REQUEST['group-filter-box'] ) ) || ( !$bp->current_action && !isset($_REQUEST['page']) && empty( $_REQUEST['group-filter-box'] ) ) ) {
+
+            $order = $bp->action_variables[0];
             
             if ( $order == 'recently-joined' ) {
-                $this->groups = groups_get_recently_joined_for_user( $bp['current_userid'], $this->pag_num, $this->pag_page );
+                $this->groups = groups_get_recently_joined_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
             } else if ( $order == 'most-popular' ) {
-                $this->groups = groups_get_most_popular_for_user( $bp['current_userid'], $this->pag_num, $this->pag_page );             
+                $this->groups = groups_get_most_popular_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );               
             } else if ( $order == 'admin-of' ) {
-                $this->groups = groups_get_user_is_admin_of( $bp['current_userid'], $this->pag_num, $this->pag_page );              
+                $this->groups = groups_get_user_is_admin_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                
             } else if ( $order == 'mod-of' ) {
-                $this->groups = groups_get_user_is_mod_of( $bp['current_userid'], $this->pag_num, $this->pag_page );                
+                $this->groups = groups_get_user_is_mod_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );              
             } else if ( $order == 'alphabetically' ) {
-                $this->groups = groups_get_alphabetically_for_user( $bp['current_userid'], $this->pag_num, $this->pag_page );   
+                $this->groups = groups_get_alphabetically_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page ); 
             } else {
-                $this->groups = groups_get_recently_active_for_user( $bp['current_userid'], $this->pag_num, $this->pag_page );
+                $this->groups = groups_get_recently_active_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
             }
 
@@ -50 +50 @@
             $this->group_count = count($this->groups);
         
-        } else if ( ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] != '' ) || ( !$bp['current_action'] && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] != '' ) ) {
+        } else if ( ( $bp->current_action == 'my-groups' && $_REQUEST['group-filter-box'] != '' ) || ( !$bp->current_action && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] != '' ) ) {
 
             $this->groups = groups_filter_user_groups( $_REQUEST['group-filter-box'], $this->pag_num, $this->pag_page );
@@ -57 +57 @@
             $this->group_count = count($this->groups);
         
-        } else if ( $bp['current_action'] == 'invites' ) {
+        } else if ( $bp->current_action == 'invites' ) {
         
             $this->groups = groups_get_invites_for_user();
@@ -83 +83 @@
             $this->single_group = true;
             
-            $group = new stdClass();
+            $group = new stdClass;
             $group->group_id = BP_Groups_Group::get_id_from_slug($group_slug);
             
@@ -92 +92 @@
         } else {
             
-            $this->groups = groups_get_user_groups( $bp['current_userid'], $this->pag_num, $this->pag_page );
+            $this->groups = groups_get_user_groups( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
             $this->total_group_count = (int)$this->groups['total'];
             $this->groups = $this->groups['groups'];
@@ -167 +167 @@
     
     if ( !$is_single_group ) {
-        $groups_template = new BP_Groups_Template( $bp['current_userid'], false, $groups_per_page );
+        $groups_template = new BP_Groups_Template( $bp->displayed_user->id, false, $groups_per_page );
     } else {
-        $groups_template = new BP_Groups_Template( $bp['current_userid'], $group_obj->slug, $groups_per_page );     
+        $groups_template = new BP_Groups_Template( $bp->displayed_user->id, $group_obj->slug, $groups_per_page );       
     }
     
@@ -191 +191 @@
         return true;
     } else {
-        if ( groups_is_user_member( $bp['loggedin_userid'], $groups_template->group->id ) ) {
+        if ( groups_is_user_member( $bp->loggedin_user->id, $groups_template->group->id ) ) {
             return true;
         }
@@ -202 +202 @@
     global $groups_template;
     
-    if ( $groups_template->group->news == '' )
+    if ( empty( $groups_template->group->news ) )
         return false;
     
@@ -265 +265 @@
     $last_active = groups_get_groupmeta( $groups_template->group->id, 'last_activity' );
     
-    if ( $last_active == '' )
+    if ( empty( $last_active ) )
         _e( 'not yet active', 'buddypress' );
     else
@@ -278 +278 @@
     
     if ( $echo )
-        echo apply_filters( 'bp_group_permalink', $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug );
+        echo apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group_obj->slug );
     else
-        return apply_filters( 'bp_group_permalink', $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug );
+        return apply_filters( 'bp_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group_obj->slug );
 }
 
@@ -290 +290 @@
     
     if ( $echo )
-        echo apply_filters( 'bp_group_admin_permalink', $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug . '/admin' );
+        echo apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group_obj->slug . '/admin' );
     else
-        return apply_filters( 'bp_group_admin_permalink', $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $group_obj->slug . '/admin' );   
+        return apply_filters( 'bp_group_admin_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group_obj->slug . '/admin' ); 
 }
 
@@ -480 +480 @@
     global $groups_template, $bp;
 
-    if ( $bp['current_action'] == 'my-groups' || !$bp['current_action'] ) {
-        $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/my-groups/search/';
+    if ( $bp->current_action == 'my-groups' || !$bp->current_action ) {
+        $action = $bp->loggedin_user->domain . $bp->groups->slug . '/my-groups/search/';
         $label = __('Filter Groups', 'buddypress');
         $name = 'group-filter-box';
     } else {
-        $action = $bp['loggedin_domain'] . $bp['groups']['slug'] . '/group-finder/search/';
+        $action = $bp->loggedin_user->domain . $bp->groups->slug . '/group-finder/search/';
         $label = __('Find a Group', 'buddypress');
         $name = 'groupfinder-search-box';
-        $value = $bp['action_variables'][0];
+        $value = $bp->action_variables[0];
     }
 ?>
     <form action="<?php echo $action ?>" id="group-search-form" method="post">
-        <label for="<?php echo $name ?>" id="<?php echo $name ?>-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></label>
+        <label for="<?php echo $name ?>" id="<?php echo $name ?>-label"><?php echo $label ?> <img id="ajax-loader" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></label>
         <input type="search" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo $value ?>"<?php echo $disabled ?> />
         <?php if ( function_exists('wp_nonce_field') )
@@ -504 +504 @@
     global $bp;
     
-    if ( !groups_total_groups_for_user( $bp['current_userid'] ) )
+    if ( !groups_total_groups_for_user( $bp->displayed_user->id ) )
         return true;
         
@@ -715 +715 @@
     global $bp, $groups_template;
     
-    $current_tab = $bp['action_variables'][0];
+    $current_tab = $bp->action_variables[0];
 ?>
-    <?php if ( $bp['is_item_admin'] || $bp['is_item_mod'] ) { ?>
-        <li<?php if ( $current_tab == 'edit-details' || $current_tab == '' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
+    <?php if ( $bp->is_item_admin || $bp->is_item_mod ) { ?>
+        <li<?php if ( $current_tab == 'edit-details' || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
     <?php } ?>
 
-    <?php if ( $bp['is_item_admin'] ) { ?>  
-        <li<?php if ( $current_tab == 'group-settings' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/group-settings"><?php _e('Group Settings', 'buddypress') ?></a></li>
+    <?php if ( $bp->is_item_admin ) { ?>    
+        <li<?php if ( $current_tab == 'group-settings' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/group-settings"><?php _e('Group Settings', 'buddypress') ?></a></li>
     <?php } ?>
     
-    <?php if ( $bp['is_item_admin'] ) { ?>  
-        <li<?php if ( $current_tab == 'group-avatar' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/group-avatar"><?php _e('Group Avatar', 'buddypress') ?></a></li>
+    <?php if ( $bp->is_item_admin ) { ?>    
+        <li<?php if ( $current_tab == 'group-avatar' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/group-avatar"><?php _e('Group Avatar', 'buddypress') ?></a></li>
     <?php } ?>
 
-    <?php if ( $bp['is_item_admin'] ) { ?>          
-        <li<?php if ( $current_tab == 'manage-members' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
+    <?php if ( $bp->is_item_admin ) { ?>            
+        <li<?php if ( $current_tab == 'manage-members' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
     <?php } ?>
     
-    <?php if ( $bp['is_item_admin'] && $groups_template->group->status == 'private' ) : ?>
-    <li<?php if ( $current_tab == 'membership-requests' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
+    <?php if ( $bp->is_item_admin && $groups_template->group->status == 'private' ) : ?>
+    <li<?php if ( $current_tab == 'membership-requests' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
     <?php endif; ?>
 
-    <?php if ( $bp['is_item_admin'] ) { ?>      
-        <li<?php if ( $current_tab == 'delete-group' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['root_domain'] . '/' . $bp['groups']['slug'] ?>/<?php echo $groups_template->group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
+    <?php if ( $bp->is_item_admin ) { ?>        
+        <li<?php if ( $current_tab == 'delete-group' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
     <?php } ?>
     
@@ -763 +763 @@
         $group = $groups_template->group;
     
-    if ( groups_check_for_membership_request( $bp['loggedin_userid'], $group->id ) )
+    if ( groups_check_for_membership_request( $bp->loggedin_user->id, $group->id ) )
         return true;
     
@@ -772 +772 @@
     global $bp, $create_group_step, $completed_to_step;
 ?>
-    <li<?php if ( $create_group_step == '1' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/1">1. <?php _e('Group Details', 'buddypress') ?></a></li>
-    <li<?php if ( $create_group_step == '2' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 0 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/2">2. <?php _e('Group Settings', 'buddypress') ?></a><?php } else { ?><span>2. <?php _e('Group Settings', 'buddypress') ?></span><?php } ?></li>
-    <li<?php if ( $create_group_step == '3' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 1 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/3">3. <?php _e('Group Avatar', 'buddypress') ?></a><?php } else { ?><span>3. <?php _e('Group Avatar', 'buddypress') ?></span><?php } ?></li>
-    <li<?php if ( $create_group_step == '4' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 2 ) { ?><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/4">4. <?php _e('Invite Members', 'buddypress') ?></a><?php } else { ?><span>4. <?php _e('Invite Members', 'buddypress') ?></span><?php } ?></li>
+    <li<?php if ( $create_group_step == '1' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/1">1. <?php _e('Group Details', 'buddypress') ?></a></li>
+    <li<?php if ( $create_group_step == '2' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 0 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/2">2. <?php _e('Group Settings', 'buddypress') ?></a><?php } else { ?><span>2. <?php _e('Group Settings', 'buddypress') ?></span><?php } ?></li>
+    <li<?php if ( $create_group_step == '3' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 1 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/3">3. <?php _e('Group Avatar', 'buddypress') ?></a><?php } else { ?><span>3. <?php _e('Group Avatar', 'buddypress') ?></span><?php } ?></li>
+    <li<?php if ( $create_group_step == '4' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 2 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/4">4. <?php _e('Invite Members', 'buddypress') ?></a><?php } else { ?><span>4. <?php _e('Invite Members', 'buddypress') ?></span><?php } ?></li>
 <?php
     do_action( 'groups_creation_tabs' );
@@ -807 +807 @@
 
 ?>
-    <form action="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/create/step/<?php echo $create_group_step ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
+    <form action="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/<?php echo $create_group_step ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
     <?php switch( $create_group_step ) {
         case '1': ?>
@@ -907 +907 @@
                 
                 if ( function_exists('friends_install') ) {
-                    if ( friends_get_friend_count_for_user( $bp['loggedin_userid'] ) ) {
+                    if ( friends_get_friend_count_for_user( $bp->loggedin_user->id ) ) {
                         bp_group_send_invite_form( $group_obj );
                     } else {
@@ -936 +936 @@
         return false;
 
-        $friends = friends_get_friends_invite_list( $bp['loggedin_userid'], $group_obj->id );
+        $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $group_obj->id );
 
         if ( $friends ) {
-            $invites = groups_get_invites_for_group( $bp['loggedin_userid'], $group_obj->id );
+            $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_obj->id );
 
     ?>
@@ -968 +968 @@
     global $bp, $create_group_step, $completed_to_step;
 ?>
-    <li<?php if ( !isset($bp['action_variables'][0]) || $bp['action_variables'][0] == 'recently-active' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-    <li<?php if ( $bp['action_variables'][0] == 'recently-joined' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
-    <li<?php if ( $bp['action_variables'][0] == 'most-popular' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
-    <li<?php if ( $bp['action_variables'][0] == 'admin-of' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( $bp['action_variables'][0] == 'mod-of' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( $bp['action_variables'][0] == 'alphabetically' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+    <li<?php if ( !isset($bp->action_variables[0]) || $bp->action_variables[0] == 'recently-active' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+    <li<?php if ( $bp->action_variables[0] == 'recently-joined' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
+    <li<?php if ( $bp->action_variables[0] == 'most-popular' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
+    <li<?php if ( $bp->action_variables[0] == 'admin-of' ) : ?> 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 ( $bp->action_variables[0] == 'mod-of' ) : ?> 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 ( $bp->action_variables[0] == 'alphabetically' ) : ?> 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
@@ -982 +982 @@
     global $bp;
     
-    $current_filter = $bp['action_variables'][0];
+    $current_filter = $bp->action_variables[0];
     
     switch ( $current_filter ) {
@@ -1009 +1009 @@
     global $bp, $groups_template;
     
-    if ( groups_is_user_member( $bp['loggedin_userid'], $groups_template->group->id ) )
+    if ( groups_is_user_member( $bp->loggedin_user->id, $groups_template->group->id ) )
         return true;
     
@@ -1018 +1018 @@
     global $groups_template, $bp;
     
-    echo apply_filters( 'bp_group_accept_invite_link', $bp['loggedin_domain'] . $bp['groups']['slug'] . '/invites/accept/' . $groups_template->group->id ); 
+    echo apply_filters( 'bp_group_accept_invite_link', $bp->loggedin_user->domain . $bp->groups->slug . '/invites/accept/' . $groups_template->group->id ); 
 }
 
@@ -1024 +1024 @@
     global $groups_template, $bp;
     
-    echo apply_filters( 'bp_group_reject_invite_link', $bp['loggedin_domain'] . $bp['groups']['slug'] . '/invites/reject/' . $groups_template->group->id );
+    echo apply_filters( 'bp_group_reject_invite_link', $bp->loggedin_user->domain . $bp->groups->slug . '/invites/reject/' . $groups_template->group->id );
 }
 
@@ -1033 +1033 @@
         return false;
     
-    if ( !friends_check_user_has_friends( $bp['loggedin_userid'] ) || !friends_count_invitable_friends( $bp['loggedin_userid'], $groups_template->group->id ) )
+    if ( !friends_check_user_has_friends( $bp->loggedin_user->id ) || !friends_count_invitable_friends( $bp->loggedin_user->id, $groups_template->group->id ) )
         return false;
     
@@ -1058 +1058 @@
 ?>
     <div class="left-menu">
-        <h4><?php _e( 'Select Friends', 'buddypress' ) ?> <img id="ajax-loader" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></h4>
+        <h4><?php _e( 'Select Friends', 'buddypress' ) ?> <img id="ajax-loader" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /></h4>
         <?php bp_group_list_invite_friends() ?>
         <?php wp_nonce_field( 'invite_user' ) ?>
@@ -1070 +1070 @@
         </div>
 
-        <?php $invites = groups_get_invites_for_group( $bp['loggedin_userid'], $group_obj->id ) ?>
+        <?php $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_obj->id ) ?>
         
         <ul id="friend-list" class="item-list">
@@ -1081 +1081 @@
                     <span class="activity"><?php echo $user->last_active ?></span>
                     <div class="action">
-                        <a class="remove" href="<?php echo site_url() . $bp['groups']['slug'] . '/' . $group_obj->id . '/invites/remove/' . $user->id ?>" id="uid-<?php echo $user->id ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a> 
+                        <a class="remove" href="<?php echo site_url() . $bp->groups->slug . '/' . $group_obj->id . '/invites/remove/' . $user->id ?>" id="uid-<?php echo $user->id ?>"><?php _e( 'Remove Invite', 'buddypress' ) ?></a> 
                     </div>
                 </li>
@@ -1097 +1097 @@
         <img src="<?php echo $group_obj->avatar_full ?>" alt="Group Avatar" class="avatar" />
     <?php } else { ?>
-        <img src="<?php echo $bp['groups']['image_base'] . '/none.gif' ?>" alt="No Group Avatar" class="avatar" />
+        <img src="<?php echo $bp->groups->image_base . '/none.gif' ?>" alt="No Group Avatar" class="avatar" />
     <?php }
 }
@@ -1122 +1122 @@
     
     // 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_userid'], $group->id ) )
+    if ( !is_user_logged_in() || groups_is_user_banned( $bp->loggedin_user->id, $group->id ) )
         return false;
     
@@ -1129 +1129 @@
     switch ( $group->status ) {
         case 'public':
-            if ( BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group->id ) )
+            if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) )
                 echo '<a class="leave-group" href="' . bp_group_permalink( $group, false ) . '/leave-group">' . __('Leave Group', 'buddypress') . '</a>';                                   
             else
@@ -1136 +1136 @@
         
         case 'private':
-            if ( BP_Groups_Member::check_is_member( $bp['loggedin_userid'], $group->id ) ) {
+            if ( BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group->id ) ) {
                 echo '<a class="leave-group" href="' . bp_group_permalink( $group, false ) . '/leave-group">' . __('Leave Group', 'buddypress') . '</a>';                                       
             } else {
@@ -1214 +1214 @@
     global $bp;
     
-    $group_ids = BP_Groups_Member::get_random_groups( $bp['current_userid'] );
+    $group_ids = BP_Groups_Member::get_random_groups( $bp->displayed_user->id );
 ?>  
     <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() ?>) <a href="<?php echo $bp['current_domain'] . $bp['groups']['slug'] ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></h4>
+        <h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php echo BP_Groups_Member::total_group_count() ?>) <a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>"><?php _e('See All', 'buddypress') ?> &raquo;</a></h4>
         <?php if ( $group_ids ) { ?>
             <ul class="horiz-gallery">
@@ -1411 +1411 @@
     global $bp;
     
-    if ( $bp['current_action'] == 'group-finder' )
+    if ( $bp->current_action == 'group-finder' )
         echo apply_filters( 'bp_group_reject_invite_link', 'groupfinder-pag' );
     else

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

@@ -33 +33 @@
     <?php if ( $groups['groups'] ) : ?>
         <div class="item-options" id="groups-list-options">
-            <img id="ajax-loader-groups" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
+            <img id="ajax-loader-groups" src="<?php echo $bp->groups->image_base ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
             <a href="<?php echo site_url() . '/groups' ?>" id="newest-groups"><?php _e("Newest", 'buddypress') ?></a> | 
             <a href="<?php echo site_url() . '/groups' ?>" id="recently-active-groups"><?php _e("Active", 'buddypress') ?></a> | 

trunk/bp-groups/directories/bp-groups-directory-groups.php

@@ -3 +3 @@
     global $bp, $current_blog;
     
-    if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['current_action'] == '' ) {
+    if ( $bp->current_component == $bp->groups->slug && empty( $bp->current_action ) ) {
         add_action( 'bp_template_content', 'groups_directory_groups_content' );
         add_action( 'bp_template_sidebar', 'groups_directory_groups_sidebar' );
@@ -88 +88 @@
             <div id="group-dir-count" class="pag-count">
                 <?php echo sprintf( __( 'Viewing group %d to %d (%d total active groups)', 'buddypress' ), $from_num, $to_num, $groups['total'] ); ?> &nbsp;
-                <img id="ajax-loader-groups" src="<?php echo $bp['core']['image_base'] ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
+                <img id="ajax-loader-groups" src="<?php echo $bp->core->image_base ?>/ajax-loader.gif" height="7" alt="<?php _e( "Loading", "buddypress" ) ?>" style="display: none;" />
             </div>
             
@@ -156 +156 @@
     <div class="widget">
         <h2 class="widgettitle"><?php _e( 'Find Groups', 'buddypress' ) ?></h2>
-        <form action="<?php echo site_url() . '/' . $bp['groups']['slug']  . '/search/' ?>" method="post" id="search-groups-form">
+        <form action="<?php echo site_url() . '/' . $bp->groups->slug  . '/search/' ?>" method="post" id="search-groups-form">
             <label><input type="text" name="groups_search" id="groups_search" value="<?php if ( isset( $_GET['s'] ) ) { echo $_GET['s']; } else { _e('Search anything...', 'buddypress' ); } ?>"  onfocus="if (this.value == '<?php _e('Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e('Search anything...', 'buddypress' ) ?>';}" /></label>
             <input type="submit" id="groups_search_submit" name="groups_search_submit" value="Search" />

trunk/bp-messages.php

@@ -29 +29 @@
         
     // Remove indexes so we can alter the field types for these fields.
-    $wpdb->query( "ALTER TABLE ". $bp['messages']['table_name_threads'] . " DROP INDEX message_ids " );
-    $wpdb->query( "ALTER TABLE ". $bp['messages']['table_name_threads'] . " DROP INDEX sender_ids " );
-    
-    $sql[] = "CREATE TABLE ". $bp['messages']['table_name_threads'] ." (
+    $wpdb->query( "ALTER TABLE {$bp->messages->table_name_threads} DROP INDEX message_ids " );
+    $wpdb->query( "ALTER TABLE {$bp->messages->table_name_threads} DROP INDEX sender_ids " );
+    
+    $sql[] = "CREATE TABLE {$bp->messages->table_name_threads} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 message_ids longtext NOT NULL,
@@ -44 +44 @@
                ) {$charset_collate};";
     
-    $sql[] = "CREATE TABLE ". $bp['messages']['table_name_recipients'] ." (
+    $sql[] = "CREATE TABLE {$bp->messages->table_name_recipients} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 user_id int(11) NOT NULL,
@@ -58 +58 @@
                ) {$charset_collate};";
 
-    $sql[] = "CREATE TABLE ". $bp['messages']['table_name_messages'] ." (
+    $sql[] = "CREATE TABLE {$bp->messages->table_name_messages} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 sender_id int(11) NOT NULL,
@@ -71 +71 @@
                ) {$charset_collate};";
     
-    $sql[] = "CREATE TABLE ". $bp['messages']['table_name_notices'] ." (
+    $sql[] = "CREATE TABLE {$bp->messages->table_name_notices} (
                 id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 subject varchar(200) NOT NULL,
@@ -97 +97 @@
     global $bp, $wpdb;
     
-    $bp['messages'] = array(
-        'table_name'               => $wpdb->base_prefix . 'bp_messages',
-        'table_name_threads'       => $wpdb->base_prefix . 'bp_messages_threads',
-        'table_name_messages'      => $wpdb->base_prefix . 'bp_messages_messages',
-        'table_name_recipients'    => $wpdb->base_prefix . 'bp_messages_recipients',
-        'table_name_notices'       => $wpdb->base_prefix . 'bp_messages_notices',
-        'format_activity_function' => 'messages_format_activity',
-        'image_base'               => site_url( MUPLUGINDIR . '/bp-messages/images' ),
-        'slug'                     => BP_MESSAGES_SLUG
-    );
-
-    $bp['version_numbers'][$bp['messages']['slug']] = BP_MESSAGES_VERSION;
+    $bp->messages->table_name_threads = $wpdb->base_prefix . 'bp_messages_threads';
+    $bp->messages->table_name_messages = $wpdb->base_prefix . 'bp_messages_messages';
+    $bp->messages->table_name_recipients = $wpdb->base_prefix . 'bp_messages_recipients';
+    $bp->messages->table_name_notices = $wpdb->base_prefix . 'bp_messages_notices';
+    $bp->messages->format_activity_function = 'messages_format_activity';
+    $bp->messages->image_base = site_url( MUPLUGINDIR . '/bp-messages/images' );
+    $bp->messages->slug = BP_MESSAGES_SLUG;
+
+    $bp->version_numbers->messages = BP_MESSAGES_VERSION;
 }
 add_action( 'wp', 'messages_setup_globals', 1 );    
@@ -126 +123 @@
     if ( is_site_admin() ) {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( ( $wpdb->get_var( "SHOW TABLES LIKE '%" . $bp['messages']['table_name'] . "%'" ) == false ) || ( get_site_option('bp-messages-db-version') < BP_MESSAGES_DB_VERSION ) )
+        if ( ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->messages->table_name_messages}%'" ) == false ) || ( get_site_option('bp-messages-db-version') < BP_MESSAGES_DB_VERSION ) )
             messages_install();
     }
@@ -146 +143 @@
     
     /* Add 'Profile' to the main navigation */
-    bp_core_add_nav_item( __('Messages', 'buddypress'), $bp['messages']['slug'], false, false );
-    bp_core_add_nav_default( $bp['messages']['slug'], 'messages_screen_inbox', 'inbox', bp_is_home() );
-    
-    $messages_link = $bp['loggedin_domain'] . $bp['messages']['slug'] . '/';
+    bp_core_add_nav_item( __('Messages', 'buddypress'), $bp->messages->slug, false, false );
+    bp_core_add_nav_default( $bp->messages->slug, 'messages_screen_inbox', 'inbox', bp_is_home() );
+    
+    $messages_link = $bp->loggedin_user->domain . $bp->messages->slug . '/';
     
     /* Add the subnav items to the profile */
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'inbox', __('Inbox', 'buddypress') . $count_indicator, $messages_link, 'messages_screen_inbox', false, bp_is_home() );
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'sentbox', __('Sent Messages', 'buddypress'), $messages_link, 'messages_screen_sentbox', false, bp_is_home() );
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'compose', __('Compose', 'buddypress'), $messages_link, 'messages_screen_compose', false, bp_is_home() );
-    bp_core_add_subnav_item( $bp['messages']['slug'], 'notices', __('Notices', 'buddypress'), $messages_link, 'messages_screen_notices', false, true, true );
-
-    if ( $bp['current_component'] == $bp['messages']['slug'] ) {
+    bp_core_add_subnav_item( $bp->messages->slug, 'inbox', __('Inbox', 'buddypress') . $count_indicator, $messages_link, 'messages_screen_inbox', false, bp_is_home() );
+    bp_core_add_subnav_item( $bp->messages->slug, 'sentbox', __('Sent Messages', 'buddypress'), $messages_link, 'messages_screen_sentbox', false, bp_is_home() );
+    bp_core_add_subnav_item( $bp->messages->slug, 'compose', __('Compose', 'buddypress'), $messages_link, 'messages_screen_compose', false, bp_is_home() );
+    bp_core_add_subnav_item( $bp->messages->slug, 'notices', __('Notices', 'buddypress'), $messages_link, 'messages_screen_notices', false, true, true );
+
+    if ( $bp->current_component == $bp->messages->slug ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Messages', 'buddypress');          
-        } else {
-            $bp_options_avatar = bp_core_get_avatar( $bp['current_userid'], 1 );
-            $bp['bp_options_title'] = $bp['current_fullname']; 
+            $bp->bp_options_title = __( 'My Messages', 'buddypress' );          
+        } else {
+            $bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+            $bp->bp_options_title = $bp->displayed_user->fullname;
         }
     }
@@ -214 +211 @@
         return false;
         
-    $notice_id = $bp['action_variables'][1];
+    $notice_id = $bp->action_variables[1];
 
     if ( $notice_id && is_numeric($notice_id) ) {
         $notice = new BP_Messages_Notice($notice_id);
 
-        if ( $bp['action_variables'][0] == 'deactivate' ) {
+        if ( $bp->action_variables[0] == 'deactivate' ) {
             if ( !$notice->deactivate() ) {
                 bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );  
@@ -225 +222 @@
                 bp_core_add_message( __('Notice deactivated.', 'buddypress') );
             }
-        } else if ( $bp['action_variables'][0] == 'activate' ) {
+        } else if ( $bp->action_variables[0] == 'activate' ) {
             if ( !$notice->activate() ) {
                 bp_core_add_message( __('There was a problem activating that notice.', 'buddypress'), 'error' );
@@ -231 +228 @@
                 bp_core_add_message( __('Notice activated.', 'buddypress') );
             }
-        } else if ( $bp['action_variables'][0] == 'delete' ) {
+        } else if ( $bp->action_variables[0] == 'delete' ) {
             if ( !$notice->delete() ) {
                 bp_core_add_message( __('There was a problem deleting that notice.', 'buddypress'), 'buddypress' );
@@ -238 +235 @@
             }
         }
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['messages']['slug'] . '/notices' );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->messages->slug . '/notices' );
     }
     
@@ -279 +276 @@
     global $bp, $thread_id;
     
-    if ( $bp['current_component'] != $bp['messages']['slug'] || $bp['current_action'] != 'view' )
+    if ( $bp->current_component != $bp->messages->slug || $bp->current_action != 'view' )
         return false;
         
-    $thread_id = $bp['action_variables'][0];
+    $thread_id = $bp->action_variables[0];
 
     if ( !$thread_id || !is_numeric($thread_id) || !BP_Messages_Thread::check_access($thread_id) ) {
-        bp_core_redirect( $bp['current_domain'] . $bp['current_component'] );
-    } else {
-        $bp['bp_options_nav'][$bp['messages']['slug']]['view'] = array(
+        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component );
+    } else {
+        $bp->bp_options_nav[$bp->messages->slug]['view'] = array(
             'name' => __('From: ' . BP_Messages_Thread::get_last_sender($thread_id), 'buddypress'),
-            'link' => $bp['loggedin_domain'] . $bp['messages']['slug'] . '/'            
+            'link' => $bp->loggedin_user->domain . $bp->messages->slug . '/'            
         );
 
@@ -301 +298 @@
     global $bp, $thread_id;
     
-    if ( $bp['current_component'] != $bp['messages']['slug'] || $bp['action_variables'][0] != 'delete' )
+    if ( $bp->current_component != $bp->messages->slug || $bp->action_variables[0] != 'delete' )
         return false;
     
-    $thread_id = $bp['action_variables'][1];
+    $thread_id = $bp->action_variables[1];
 
     if ( !$thread_id || !is_numeric($thread_id) || !BP_Messages_Thread::check_access($thread_id) ) {
-        bp_core_redirect( $bp['current_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );
-    } else {
-        //echo $bp['loggedin_domain'] . $bp['current_component'] . '/' . $bp['current_action']; die;
+        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/' . $bp->current_action );
+    } else {
+        //echo $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action; die;
         // delete message
         if ( !messages_delete_thread($thread_id) ) {
@@ -316 +313 @@
             bp_core_add_message( __('Message deleted.', 'buddypress') );
         }
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
     }
 }
@@ -325 +322 @@
     global $bp, $thread_ids;
     
-    if ( $bp['current_component'] != $bp['messages']['slug'] || $bp['action_variables'][0] != 'bulk-delete' )
+    if ( $bp->current_component != $bp->messages->slug || $bp->action_variables[0] != 'bulk-delete' )
         return false;
     
@@ -331 +328 @@
 
     if ( !$thread_ids || !BP_Messages_Thread::check_access($thread_ids) ) {
-        bp_core_redirect( $bp['current_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );         
+        bp_core_redirect( $bp->displayed_user->domain . $bp->current_component . '/' . $bp->current_action );           
     } else {
         if ( !messages_delete_thread( $thread_ids ) ) {
@@ -338 +335 @@
             bp_core_add_message( __('Messages deleted.', 'buddypress') );
         }
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/' . $bp['current_action'] );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
     }
 }
@@ -370 +367 @@
     if ( $action == 'new_message') {
         if ( (int)$total_items > 1 )
-            return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp['loggedin_domain'] . $bp['messages']['slug'] . '/inbox" title="Inbox">' . sprintf( __('You have %d new messages'), (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'), (int)$total_items ) . '</a>', $total_items );       
         else
-            return apply_filters( 'bp_messages_single_new_message_notification', '<a href="' . $bp['loggedin_domain'] . $bp['messages']['slug'] . '/inbox" title="Inbox">' . sprintf( __('You have %d new message'), (int)$total_items ) . '</a>', $total_items );
+            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'), (int)$total_items ) . '</a>', $total_items );
     }
     
@@ -400 +397 @@
             bp_core_add_message( __('There was an error posting that notice.', 'buddypress'), 'error' );            
         }
-        bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/notices' );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/notices' );
         return true;
     }
@@ -410 +407 @@
         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_domain'] . $bp['current_component'] . '/compose' );
+            bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
         } else {
             return array('status' => 0, 'message' => __('There was an error sending the reply, please try again.', 'buddypress'));
@@ -418 +415 @@
     } else if ( count( $recipients ) == 1 && $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_domain'] . $bp['current_component'] . '/compose' ); 
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );   
     
     // If the subject or content boxes are empty.
@@ -424 +421 @@
         if ( !$from_ajax ) {
             bp_core_add_message( __('Please make sure you fill in all the fields.', 'buddypress'), 'error' );
-            bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/compose' );
+            bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
         } else {
             return array('status' => 0, 'message' => __('Please make sure you have typed a message before sending a reply.', 'buddypress'));
@@ -438 +435 @@
         $pmessage = new BP_Messages_Message;
 
-        $pmessage->sender_id = $bp['loggedin_userid'];
+        $pmessage->sender_id = $bp->loggedin_user->id;
         $pmessage->subject = $subject;
         $pmessage->message = $content;
@@ -462 +459 @@
                 } else {
                     bp_core_add_message( $message, $type );
-                    bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/compose' );
+                    bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );
                 } 
             } else {
-                $message = __('Message sent successfully!', 'buddypress') . ' <a href="' . $bp['loggedin_domain'] . $bp['messages']['slug'] . '/view/' . $pmessage->thread_id . '">' . __('View Message', 'buddypress') . '</a> &raquo;';
+                $message = __('Message sent successfully!', 'buddypress') . ' <a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . $pmessage->thread_id . '">' . __('View Message', 'buddypress') . '</a> &raquo;';
                 $type = 'success';
                 
                 // Send notices to the recipients
                 for ( $i = 0; $i < count($pmessage->recipients); $i++ ) {
-                    if ( $pmessage->recipients[$i] != $bp['loggedin_userid'] ) {
+                    if ( $pmessage->recipients[$i] != $bp->loggedin_user->id ) {
                         bp_core_add_notification( $pmessage->id, $pmessage->recipients[$i], 'messages', 'new_message' );    
                     }
@@ -481 +478 @@
                 } else {
                     bp_core_add_message( $message );
-                    bp_core_redirect( $bp['loggedin_domain'] . $bp['current_component'] . '/inbox' );
+                    bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/inbox' );
                 }
             }
@@ -492 +489 @@
             } else {
                 bp_core_add_message( $message, $type );
-                bp_core_redirect( $bp['loggedin_domain'] . $bp['messages']['slug'] . '/compose' );
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->messages->slug . '/compose' );
             }
         }
@@ -601 +598 @@
                         <tr>
                             <td>
-                                <img src="<?php echo $bp['messages']['image_base'] ?>/email_open.gif" alt="Message" style="vertical-align: top;" /> &nbsp;
+                                <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_userid']) ?>. 
+                                <?php _e('and', 'buddypress') ?> <?php echo bp_core_get_userlink($bp->loggedin_user->id) ?>. 
                             </td>
                         </tr>
@@ -631 +628 @@
                                 <div class="avatar-box">
                                     <?php if ( function_exists('bp_core_get_avatar') ) 
-                                        echo bp_core_get_avatar($bp['loggedin_userid'], 1);
+                                        echo bp_core_get_avatar($bp->loggedin_user->id, 1);
                                     ?>
                     

trunk/bp-messages/autocomplete/bp-messages-autocomplete.php

@@ -10 +10 @@
 
 // Get the friend ids based on the search terms
-$friends = friends_search_friends( $_GET['q'], $bp['loggedin_userid'], $_GET['limit'], 1 );
+$friends = friends_search_friends( $_GET['q'], $bp->loggedin_user->id, $_GET['limit'], 1 );
 
 if ( $friends['friends'] ) {

trunk/bp-messages/bp-messages-ajax.php

@@ -21 +21 @@
         <?php
     } else {
-        $result['message'] = '<img src="' . $bp['messages']['image_base'] . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
+        $result['message'] = '<img src="' . $bp->messages->image_base . '/warning.gif" alt="Warning" /> &nbsp;' . $result['message'];
         echo "-1[[split]]" . $result['message'];
     }

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

@@ -38 +38 @@
         global $wpdb, $bp;
 
-        $thread = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $id ) );
+        $thread = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_threads} WHERE id = %d", $id ) );
         
         if ( $thread ) {
@@ -63 +63 @@
                     foreach ( $this->message_ids as $key => $message_id ) {
                         if ( $this->box == 'sentbox' ) {
-                            if ( !messages_is_user_sender( $bp['loggedin_userid'], $message_id ) ) {
+                            if ( !messages_is_user_sender( $bp->loggedin_user->id, $message_id ) ) {
                                 unset( $this->message_ids[$key] );
                             } else {
@@ -69 +69 @@
                             }                       
                         } else {
-                            if ( messages_is_user_sender( $bp['loggedin_userid'], $message_id ) ) {
+                            if ( messages_is_user_sender( $bp->loggedin_user->id, $message_id ) ) {
                                 unset( $this->message_ids[$key] );
                             } else {
@@ -94 +94 @@
                 $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 ) {
@@ -111 +111 @@
             
         if ( $this->message_ids)
-            return $wpdb->get_results( "SELECT * FROM " . $bp['messages']['table_name_messages'] . " WHERE id IN (" . $wpdb->escape($this->message_ids) . ")" );
+            return $wpdb->get_results( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id IN (" . $wpdb->escape($this->message_ids) . ")" );
         else
             return false;
@@ -119 +119 @@
         global $wpdb, $bp;
 
-        $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_userid'] );
+        $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);
         
@@ -136 +136 @@
         global $wpdb, $bp;
 
-        $recipients = $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d", $this->thread_id ) );
+        $recipients = $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) );
 
         for ( $i = 0; $i < count($recipients); $i++ ) {
             $recipient = $recipients[$i];
 
-            if ( count($recipients) > 1 && $recipient != $bp['loggedin_userid'] )
+            if ( count($recipients) > 1 && $recipient != $bp->loggedin_user->id )
                 $recipient_ids[] = $recipient;
         }
@@ -153 +153 @@
         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_userid'] ) );
+        $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.
-        $recipients = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d AND is_deleted = 0", $thread_id ) );
+        $recipients = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND is_deleted = 0", $thread_id ) );
 
         if ( !$recipients ) {
             // Get message ids:
-            $message_ids = $wpdb->get_var( $wpdb->prepare( "SELECT message_ids FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $thread_id ) );
+            $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 ) );
+            $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] ) );
+                $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 ) );
+            $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_recipients} WHERE id = %d", $thread_id ) );
         }
 
@@ -186 +186 @@
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             
-        $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 ORDER BY t.last_post_date DESC$pag_sql", $bp['loggedin_userid'] );
+        $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 ORDER BY t.last_post_date DESC$pag_sql", $bp->loggedin_user->id );
 
         if ( !$thread_ids = $wpdb->get_results($sql) )
@@ -207 +207 @@
         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_userid'], $thread_id );
+        $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);
     }
@@ -214 +214 @@
         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_userid'], $thread_id );
+        $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);
     }
@@ -225 +225 @@
             $exclude_sender = ' AND sender_only != 1';
 
-        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", $user_id ) );
+        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", $user_id ) );
     }
     
@@ -231 +231 @@
         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 )
@@ -238 +238 @@
         $sender_ids = unserialize($sender_ids);
         
-        return in_array( $bp['loggedin_userid'], $sender_ids );
+        return in_array( $bp->loggedin_user->id, $sender_ids );
     }
 
@@ -244 +244 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare("SELECT last_sender_id FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $thread_id);
+        $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) )
@@ -255 +255 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare( "SELECT unread_count FROM " . $bp['messages']['table_name_recipients'] . " WHERE user_id = %d AND is_deleted = 0", $bp['loggedin_userid'] );
+        $sql = $wpdb->prepare( "SELECT unread_count FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0", $bp->loggedin_user->id );
 
         if ( !$unread_counts = $wpdb->get_results($sql) )
@@ -271 +271 @@
         global $wpdb, $bp;
         
-        $sql = $wpdb->prepare("SELECT id FROM " . $bp['messages']['table_name_recipients'] . " WHERE thread_id = %d AND user_id = %d", $id, $bp['loggedin_userid'] );
+        $sql = $wpdb->prepare("SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND user_id = %d", $id, $bp->loggedin_user->id );
         $has_access = $wpdb->get_var($sql);
 
@@ -308 +308 @@
 
         $this->date_sent = time();
-        $this->sender_id = $bp['loggedin_userid'];
+        $this->sender_id = $bp->loggedin_user->id;
 
         if ( $id ) {
@@ -318 +318 @@
         global $wpdb, $bp;
         
-        $sql = $wpdb->prepare("SELECT * FROM " . $bp['messages']['table_name_messages'] . " WHERE id = %d", $id);
+        $sql = $wpdb->prepare("SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $id);
 
         if ( $message = $wpdb->get_row($sql) ) {
@@ -336 +336 @@
 
         // 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, message_order, sender_is_group ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $this->sender_id, $this->subject, $this->message, $this->date_sent, $this->message_order, $this->sender_is_group ) ) )
+        if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( sender_id, subject, message, date_sent, message_order, sender_is_group ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $this->sender_id, $this->subject, $this->message, $this->date_sent, $this->message_order, $this->sender_is_group ) ) )
             return false;
             
@@ -342 +342 @@
         if ( $this->thread_id ) {
             // Select and update the current message ids for the thread.
-            $the_ids = $wpdb->get_row( $wpdb->prepare( "SELECT message_ids, sender_ids FROM " . $bp['messages']['table_name_threads'] . " WHERE id = %d", $this->thread_id ) );
+            $the_ids = $wpdb->get_row( $wpdb->prepare( "SELECT message_ids, sender_ids FROM {$bp->messages->table_name_threads} WHERE id = %d", $this->thread_id ) );
             $message_ids = unserialize($the_ids->message_ids);
             $message_ids[] = $wpdb->insert_id;
@@ -359 +359 @@
             
             // 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 WHERE id = %d", $message_ids, $sender_ids, $wpdb->insert_id, $this->sender_id, $this->thread_id ) );
+            $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 WHERE id = %d", $message_ids, $sender_ids, $wpdb->insert_id, $this->sender_id, $this->thread_id ) );
                         
             // Find the recipients and update the unread counts for each
@@ -366 +366 @@
             
             for ( $i = 0; $i < count($this->recipients); $i++ ) {
-                if ( $this->recipients[$i]->user_id != $bp['loggedin_userid'] )
-                    $wpdb->query( $wpdb->prepare( "UPDATE " . $bp['messages']['table_name_recipients'] . " SET unread_count = unread_count + 1, sender_only = 0 WHERE thread_id = %d AND user_id = %d", $this->thread_id, $this->recipients[$i] ) );
+                if ( $this->recipients[$i]->user_id != $bp->loggedin_user->id )
+                    $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = unread_count + 1, sender_only = 0 WHERE thread_id = %d AND user_id = %d", $this->thread_id, $this->recipients[$i] ) );
             }
         } else {
@@ -373 +373 @@
             $message_id = $wpdb->insert_id;
             $serialized_message_id = serialize( array( (int)$message_id ) );
-            $serialized_sender_id = serialize( array( (int)$bp['loggedin_userid'] ) );
-            
-            $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 ); 
+            $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 ); 
             
             if ( $wpdb->query($sql) === false )
@@ -385 +385 @@
             // 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 ) );
+                $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, $this->recipients ) ) {
                 // Finally, add a recipient entry for the sender, as replies need to go to this person too.
-                $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['messages']['table_name_recipients'] . " ( user_id, thread_id, unread_count, sender_only ) VALUES ( %d, %d, 0, 0 )", $this->sender_id, $this->thread_id ) );
+                $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count, sender_only ) VALUES ( %d, %d, 0, 0 )", $this->sender_id, $this->thread_id ) );
             }
         }
@@ -403 +403 @@
         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 ) );
+        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $this->thread_id ) );
     }
     
@@ -425 +425 @@
         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 = $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_userid'] );
+        $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);
     }   
@@ -434 +434 @@
     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 ) );
+        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 ) );     
     }
 }
@@ -460 +460 @@
         global $wpdb, $bp;
         
-        $notice = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp['messages']['table_name_notices'] . " WHERE id = %d", $this->id ) );
+        $notice = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} WHERE id = %d", $this->id ) );
         
         if ( $notice ) {
@@ -474 +474 @@
         
         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 );                
         }
     
@@ -486 +486 @@
             
         // 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_userid'], 'last_activity', date( 'Y-m-d H:i:s' ) ); 
+        $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' ) ); 
         
         return true;
@@ -512 +512 @@
         global $wpdb, $bp;
         
-        $sql = $wpdb->prepare( "DELETE FROM " . $bp['messages']['table_name_notices'] . " WHERE id = %d", $this->id );
+        $sql = $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_notices} WHERE id = %d", $this->id );
         
         if ( !$wpdb->query($sql) )
@@ -525 +525 @@
         global $wpdb, $bp;
         
-        $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['messages']['table_name_notices'] . " ORDER BY date_sent DESC" ) );
+        $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC" ) );
         return $notices;
     }
@@ -532 +532 @@
         global $wpdb, $bp;
         
-        $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['messages']['table_name_notices'] ) );
+        $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp->messages->table_name_notices ) );
         return $notice_count;
     }
@@ -539 +539 @@
         global $wpdb, $bp;
         
-        $notice_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM " . $bp['messages']['table_name_notices'] . " WHERE is_active = 1") );
+        $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

@@ -4 +4 @@
     global $bp;
 
-    if ( $bp['current_component'] == $bp['messages']['slug'] )
+    if ( $bp->current_component == $bp->messages->slug )
         wp_enqueue_script( 'bp-messages-js', site_url( MUPLUGINDIR . '/bp-messages/js/general.php' ) );
 
     // Include the autocomplete JS for composing a message.
-    if ( $bp['current_component'] == $bp['messages']['slug'] && $bp['current_action'] == 'compose') {
+    if ( $bp->current_component == $bp->messages->slug && $bp->current_action == 'compose') {
         wp_enqueue_script( 'bp-jquery-autocomplete', site_url( MUPLUGINDIR . '/bp-messages/js/autocomplete/jquery.autocomplete.js' ), 'jquery' );
         wp_enqueue_script( 'bp-jquery-autocomplete-fb', site_url( MUPLUGINDIR . '/bp-messages/js/autocomplete/jquery.autocompletefb.js' ), 'jquery' );
@@ -23 +23 @@
     global $bp;
     
-    if ( $bp['current_component'] == $bp['messages']['slug'] && $bp['current_action'] == 'compose') {
+    if ( $bp->current_component == $bp->messages->slug && $bp->current_action == 'compose') {
         wp_enqueue_style( 'bp-messages-autocomplete', site_url( MUPLUGINDIR . '/bp-messages/css/autocomplete/jquery.autocompletefb.css' ) );    
         wp_print_styles();

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

@@ -98 +98 @@
     global $bp, $messages_template;
 
-    if ( $bp['current_action'] == 'notices' && !is_site_admin() ) {
-        wp_redirect( $bp['current_userid'] );
+    if ( $bp->current_action == 'notices' && !is_site_admin() ) {
+        wp_redirect( $bp->displayed_user->id );
     } else {
-        if ( $bp['current_action'] == 'inbox' )
-            bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'messages', 'new_message' );
-    
-        $messages_template = new BP_Messages_Template( $bp['loggedin_userid'], $bp['current_action'] );
+        if ( $bp->current_action == 'inbox' )
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'messages', 'new_message' );
+    
+        $messages_template = new BP_Messages_Template( $bp->loggedin_user->id, $bp->current_action );
     }
     
@@ -147 +147 @@
 function bp_message_thread_view_link() {
     global $messages_template, $bp;
-    echo apply_filters( 'bp_message_thread_view_link', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/view/' . $messages_template->thread->thread_id );
+    echo apply_filters( 'bp_message_thread_view_link', $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . $messages_template->thread->thread_id );
 }
 
 function bp_message_thread_delete_link() {
     global $messages_template, $bp;
-    echo apply_filters( 'bp_message_thread_delete_link', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/' . $bp['current_action'] . '/delete/' . $messages_template->thread->thread_id );
+    echo apply_filters( 'bp_message_thread_delete_link', $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id );
 }
 
@@ -197 +197 @@
     global $bp;
     
-    echo apply_filters( 'bp_messages_form_action', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/' . $bp['current_action'] );
+    echo apply_filters( 'bp_messages_form_action', $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action );
 }
 
@@ -219 +219 @@
     global $bp;
     
-    if ( $bp['current_action'] != 'sentbox' ) {
+    if ( $bp->current_action != 'sentbox' ) {
 ?>
         <?php _e( 'Select:', 'buddypress' ) ?> 
@@ -231 +231 @@
         <a href="#" id="mark_as_unread"><?php _e('Mark as Unread', 'buddypress') ?></a> &nbsp;
     <?php } ?>
-        <a href="#" id="delete_<?php echo $bp['current_action'] ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
+        <a href="#" id="delete_<?php echo $bp->current_action ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
 <?php   
 }
@@ -263 +263 @@
     global $messages_template, $bp;
     
-    echo apply_filters( 'bp_message_notice_delete_link', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/notices/delete/' . $messages_template->thread->id );
+    echo apply_filters( 'bp_message_notice_delete_link', $bp->loggedin_user->domain . $bp->messages->slug . '/notices/delete/' . $messages_template->thread->id );
 }
 
@@ -270 +270 @@
 
     if ( $messages_template->thread->is_active == "1" ) {
-        $link = $bp['loggedin_domain'] . $bp['messages']['slug'] . '/notices/deactivate/' . $messages_template->thread->id;
+        $link = $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id;
     } else {
-        $link = $bp['loggedin_domain'] . $bp['messages']['slug'] . '/notices/activate/' . $messages_template->thread->id;       
+        $link = $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id;       
     }
     echo apply_filters( 'bp_message_activate_deactivate_link', $link );
@@ -316 +316 @@
         return false;
     
-    $ud = get_userdata( $bp['current_userid'] ); 
+    $ud = get_userdata( $bp->displayed_user->id ); 
     ?>
     <div class="generic-button">
-        <a class="send-message" title="<?php _e( 'Send Message', 'buddypress' ) ?>" href="<?php echo $bp['loggedin_domain'] . $bp['messages']['slug'] ?>/compose/?r=<?php echo $ud->user_login ?>"><?php _e( 'Send Message', 'buddypress' ) ?></a>
+        <a class="send-message" title="<?php _e( 'Send Message', 'buddypress' ) ?>" href="<?php echo $bp->loggedin_user->domain . $bp->messages->slug ?>/compose/?r=<?php echo $ud->user_login ?>"><?php _e( 'Send Message', 'buddypress' ) ?></a>
     </div>
     <?php
@@ -326 +326 @@
 function bp_message_loading_image_src() {
     global $bp;
-    echo $bp['messages']['image_base'] . '/ajax-loader.gif';
+    echo $bp->messages->image_base . '/ajax-loader.gif';
 }
 

trunk/bp-wire.php

@@ -27 +27 @@
     global $bp, $wpdb;
     
-    $bp['wire'] = array(
-        'image_base' => site_url( MUPLUGINDIR . '/bp-wire/images' ),
-        'slug'       => BP_WIRE_SLUG
-    );
+    $bp->wire->image_base = site_url( MUPLUGINDIR . '/bp-wire/images' );
+    $bp->wire->slug = BP_WIRE_SLUG;
 
-    $bp['version_numbers'][$bp['wire']['slug']] = BP_WIRE_VERSION;
+    $bp->version_numbers->wire = BP_WIRE_VERSION;
 }
 add_action( 'wp', 'bp_wire_setup_globals', 1 ); 
@@ -47 +45 @@
 
     /* Add 'Wire' to the main navigation */
-    bp_core_add_nav_item( __('Wire', 'buddypress'), $bp['wire']['slug'] );
-    bp_core_add_nav_default( $bp['wire']['slug'], 'bp_wire_screen_latest', 'all-posts' );
+    bp_core_add_nav_item( __('Wire', 'buddypress'), $bp->wire->slug );
+    bp_core_add_nav_default( $bp->wire->slug, 'bp_wire_screen_latest', 'all-posts' );
 
     /* Add the subnav items to the wire nav */
-    bp_core_add_subnav_item( $bp['wire']['slug'], 'all-posts', __('All Posts', 'buddypress'), $bp['loggedin_domain'] . $bp['wire']['slug'] . '/', 'bp_wire_screen_latest' );
+    bp_core_add_subnav_item( $bp->wire->slug, 'all-posts', __('All Posts', 'buddypress'), $bp->loggedin_user->domain . $bp->wire->slug . '/', 'bp_wire_screen_latest' );
     
-    if ( $bp['current_component'] == $bp['wire']['slug'] ) {
+    if ( $bp->current_component == $bp->wire->slug ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Wire', 'buddypress');
+            $bp->bp_options_title = __('My Wire', 'buddypress');
         } else {
-            $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
-            $bp['bp_options_title'] = $bp['current_fullname']; 
+            $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+            $bp->bp_options_title = $bp->displayed_user->fullname; 
         }
     }
@@ -75 +73 @@
     if ( function_exists('bp_activity_record') ) {
         extract($args);
+
         bp_activity_record( $item_id, $component_name, $component_action, $is_private, $secondary_item_id, $user_id, $secondary_user_id );
     }
@@ -93 +92 @@
     
     if ( !$table_name )
-        $table_name = $bp[$component_name]['table_name_wire'];
+        $table_name = $bp->{$component_name}->table_name_wire;
 
     $wire_post = new BP_Wire_Post( $table_name );
     $wire_post->item_id = $item_id;
-    $wire_post->user_id = $bp['loggedin_userid'];
+    $wire_post->user_id = $bp->loggedin_user->id;
     $wire_post->date_posted = time();
-    
 
     $allowed_tags = apply_filters( 'bp_wire_post_allowed_tags', '<a>,<b>,<strong>,<i>,<em>,<img>' );
@@ -126 +124 @@
 
     if ( !$table_name )
-        $table_name = $bp[$component_name]['table_name_wire'];
+        $table_name = $bp->{$component_name}->table_name_wire;
     
     $wire_post = new BP_Wire_Post( $table_name, $wire_post_id );
     
-    if ( !$bp['is_item_admin'] ) {
-        if ( $wire_post->user_id != $bp['loggedin_userid'] )
+    if ( !$bp->is_item_admin ) {
+        if ( $wire_post->user_id != $bp->loggedin_user->id )
             return false;
     }

trunk/bp-wire/bp-wire-ajax.php

@@ -22 +22 @@
                 <div class="wire-post-metadata">
                     <?php bp_wire_post_author_avatar() ?>
-                    On <?php bp_wire_post_date() ?> 
-                    <?php bp_wire_post_author_name() ?> said:
+                    <?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>

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

@@ -24 +24 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare( "SELECT * FROM " . $this->table_name . " WHERE id = %d", $this->id );
+        $sql = $wpdb->prepare( "SELECT * FROM {$this->table_name} WHERE id = %d", $this->id );
 
         $wire_post = $wpdb->get_row($sql);
@@ -41 +41 @@
         if ( $this->id ) {
             $sql = $wpdb->prepare( 
-                "UPDATE " . $this->table_name . " SET 
+                "UPDATE {$this->table_name} SET 
                     item_id = %d, 
                     user_id = %d, 
@@ -57 +57 @@
         } else {
             $sql = $wpdb->prepare( 
-                "INSERT INTO " . $this->table_name . " ( 
+                "INSERT INTO {$this->table_name} ( 
                     item_id,
                     user_id,
@@ -84 +84 @@
         global $wpdb, $bp;
         
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM " . $this->table_name . " WHERE id = %d", $this->id ) );
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$this->table_name} WHERE id = %d", $this->id ) );
     }
     
@@ -95 +95 @@
             $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 ) );
+        $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 );

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

@@ -21 +21 @@
         global $bp;
         
-        if ( $bp['current_component'] == $bp['wire']['slug'] ) {
-            $this->table_name = $bp['profile']['table_name_wire'];
+        if ( $bp->current_component == $bp->wire->slug ) {
+            $this->table_name = $bp->profile->table_name_wire;
             
             // Seeing as we're viewing a users wire, lets remove any new wire
             // post notifications
-            if ( $bp['current_action'] == 'all-posts' )
-                bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'xprofile', 'new_wire_post' );
+            if ( $bp->current_action == 'all-posts' )
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'xprofile', 'new_wire_post' );
             
         } else {
-            $this->table_name = $bp[$bp['current_component']]['table_name_wire'];
+            $this->table_name = $bp->{$bp->current_component}->table_name_wire;
         }
         
@@ -42 +42 @@
         $this->wire_post_count = count($this->wire_posts);
         
-        if ( (int)get_site_option('non-friend-wire-posting') && ( $bp['current_component'] == $bp['profile']['slug'] || $bp['current_component'] == $bp['wire']['slug'] ) )
+        if ( (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
@@ -48 +48 @@
         
         $this->pag_links = paginate_links( array(
-            'base' => add_query_arg( 'wpage', '%#%', $bp['current_domain'] ),
+            'base' => add_query_arg( 'wpage', '%#%', $bp->displayed_user->domain ),
             'format' => '',
             'total' => ceil($this->total_wire_post_count / $this->pag_num),
@@ -217 +217 @@
     global $bp;
     
-    echo apply_filters( 'bp_wire_ajax_loader_src', $bp['wire']['image_base'] . '/ajax-loader.gif' );
+    echo apply_filters( 'bp_wire_ajax_loader_src', $bp->wire->image_base . '/ajax-loader.gif' );
 }
 
@@ -257 +257 @@
     global $bp;
     
-    if ( $bp['current_item'] == '')
-        $uri = $bp['current_action'];
-    else
-        $uri = $bp['current_item'];
-    
-    if ( $bp['current_component'] == 'wire' || $bp['current_component'] == 'profile' ) {
-        echo apply_filters( 'bp_wire_get_action', $bp['current_domain'] . $bp['wire']['slug'] . '/post/' );
+    if ( empty( $bp->current_item ) )
+        $uri = $bp->current_action;
+    else
+        $uri = $bp->current_item;
+    
+    if ( $bp->current_component == 'wire' || $bp->current_component == 'profile' ) {
+        echo apply_filters( 'bp_wire_get_action', $bp->displayed_user->domain . $bp->wire->slug . '/post/' );
     } else {
-        echo apply_filters( 'bp_wire_get_action', site_url() . '/' . $bp[$bp['current_component']]['slug'] . '/' . $uri . '/wire/post/' );
+        echo apply_filters( 'bp_wire_get_action', site_url() . '/' . $bp[$bp->current_component]['slug'] . '/' . $uri . '/wire/post/' );
     }
 }
@@ -272 +272 @@
     global $bp;
     
-    echo apply_filters( 'bp_wire_poster_avatar', bp_core_get_avatar( $bp['loggedin_userid'], 1 ) );
+    echo apply_filters( 'bp_wire_poster_avatar', bp_core_get_avatar( $bp->loggedin_user->id, 1 ) );
 }
 
@@ -279 +279 @@
     
     if ( $echo )
-        echo apply_filters( 'bp_wire_poster_name', '<a href="' . $bp['loggedin_domain'] . $bp['profile']['slug'] . '">' . __('You', 'buddypress') . '</a>' );
-    else
-        return apply_filters( 'bp_wire_poster_name', '<a href="' . $bp['loggedin_domain'] . $bp['profile']['slug'] . '">' . __('You', 'buddypress') . '</a>' );
+        echo apply_filters( 'bp_wire_poster_name', '<a href="' . $bp->loggedin_user->domain . $bp->profile->slug . '">' . __('You', 'buddypress') . '</a>' );
+    else
+        return apply_filters( 'bp_wire_poster_name', '<a href="' . $bp->loggedin_user->domain . $bp->profile->slug . '">' . __('You', 'buddypress') . '</a>' );
 }
 
@@ -297 +297 @@
     global $wire_posts_template, $bp;
 
-    if ( $bp['current_item'] == '')
-        $uri = $bp['current_action'];
-    else
-        $uri = $bp['current_item'];
-        
-    if ( ( $wire_posts_template->wire_post->user_id == $bp['loggedin_userid'] ) || $bp['is_item_admin'] ) {
-        if ( $bp['current_component'] == 'wire' || $bp['current_component'] == 'profile' ) {
-            echo apply_filters( 'bp_wire_delete_link', '<a href="' . $bp['current_domain'] . $bp['wire']['slug'] . '/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete', 'buddypress') . ']</a>' );
+    if ( empty( $bp->current_item ) )
+        $uri = $bp->current_action;
+    else
+        $uri = $bp->current_item;
+        
+    if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin ) {
+        if ( $bp->current_component == 'wire' || $bp->current_component == 'profile' ) {
+            echo apply_filters( 'bp_wire_delete_link', '<a href="' . $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete', 'buddypress') . ']</a>' );
         } else {
-            echo apply_filters( 'bp_wire_delete_link', '<a href="' . site_url() . '/' . $bp[$bp['current_component']]['slug'] . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete', 'buddypress') . ']</a>' );
+            echo apply_filters( 'bp_wire_delete_link', '<a href="' . site_url() . '/' . $bp[$bp->current_component]['slug'] . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete', 'buddypress') . ']</a>' );
         }
     }
@@ -314 +314 @@
     global $bp;
     
-    if ( $bp['current_item'] == '')
-        $uri = $bp['current_action'];
-    else
-        $uri = $bp['current_item'];
-    
-    if ( $bp['current_component'] == 'wire' || $bp['current_component'] == 'profile') {
-        echo apply_filters( 'bp_wire_see_all_link', $bp['current_domain'] . $bp['wire']['slug'] );
+    if ( empty( $bp->current_item ) )
+        $uri = $bp->current_action;
+    else
+        $uri = $bp->current_item;
+    
+    if ( $bp->current_component == 'wire' || $bp->current_component == 'profile') {
+        echo apply_filters( 'bp_wire_see_all_link', $bp->displayed_user->domain . $bp->wire->slug );
     } else {
-        echo apply_filters( 'bp_wire_see_all_link', $bp['root_domain'] . '/' . $bp['groups']['slug'] . '/' . $uri . '/wire' );
+        echo apply_filters( 'bp_wire_see_all_link', $bp->root_domain . '/' . $bp->groups->slug . '/' . $uri . '/wire' );
     }
 }

trunk/bp-xprofile.php

@@ -49 +49 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     
-    if ( get_site_option( 'bp-xprofile-base-group-name' ) == '' )
+    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' ) == '' )
+    if ( '' == get_site_option( 'bp-xprofile-fullname-field-name' ) )
         update_site_option( 'bp-xprofile-fullname-field-name', 'Full Name' );   
     
-    $sql[] = "CREATE TABLE " . $bp['profile']['table_name_groups'] . " (
+    $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (
               id int(11) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
               name varchar(150) NOT NULL,
@@ -63 +63 @@
     ) {$charset_collate};";
     
-    $sql[] = "CREATE TABLE " . $bp['profile']['table_name_fields'] . " (
+    $sql[] = "CREATE TABLE {$bp->profile->table_name_fields} (
               id int(11) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
               group_id int(11) unsigned NOT NULL,
@@ -84 +84 @@
     ) {$charset_collate};";
     
-    $sql[] = "CREATE TABLE " . $bp['profile']['table_name_data'] . " (
+    $sql[] = "CREATE TABLE {$bp->profile->table_name_data} (
               id int(11) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
               field_id int(11) unsigned NOT NULL,
@@ -94 +94 @@
     ) {$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'] . " ( 
+    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} ( 
                     id, group_id, parent_id, type, name, description, is_required, field_order, option_order, order_by, is_public, can_delete
                   ) VALUES (
@@ -117 +117 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
 
-    $sql[] = "CREATE TABLE ". $bp['profile']['table_name_wire'] ." (
-            id int(11) NOT NULL AUTO_INCREMENT,
-            item_id int(11) NOT NULL,
-            user_id int(11) NOT NULL,
-            content longtext NOT NULL,
-            date_posted datetime NOT NULL,
-            PRIMARY KEY id (id),
-            KEY item_id (item_id),
-            KEY user_id (user_id)
-           ) {$charset_collate};";
+    $sql[] = "CREATE TABLE {$bp->profile->table_name_wire} (
+               id int(11) NOT NULL AUTO_INCREMENT,
+               item_id int(11) NOT NULL,
+               user_id int(11) NOT NULL,
+               content longtext NOT NULL,
+               date_posted datetime NOT NULL,
+               PRIMARY KEY id (id),
+               KEY item_id (item_id),
+               KEY user_id (user_id)
+               ) {$charset_collate};";
 
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
@@ -146 +146 @@
     global $bp, $wpdb;
     
-    $bp['profile'] = array(
-        'table_name_groups' => $wpdb->base_prefix . 'bp_xprofile_groups',
-        'table_name_fields' => $wpdb->base_prefix . 'bp_xprofile_fields',
-        'table_name_data'   => $wpdb->base_prefix . 'bp_xprofile_data',
-        'format_activity_function' => 'xprofile_format_activity',
-        'image_base'        => site_url( MUPLUGINDIR . '/bp-xprofile/images' ),
-        'slug'              => BP_XPROFILE_SLUG
-    );
-    
-    $bp['version_numbers'][$bp['profile']['slug']] = BP_XPROFILE_VERSION;
+    $bp->profile->table_name_groups = $wpdb->base_prefix . 'bp_xprofile_groups';
+    $bp->profile->table_name_fields = $wpdb->base_prefix . 'bp_xprofile_fields';
+    $bp->profile->table_name_data = $wpdb->base_prefix . 'bp_xprofile_data';
+    $bp->profile->format_activity_function = 'xprofile_format_activity';
+    $bp->profile->image_base = site_url( MUPLUGINDIR . '/bp-xprofile/images' );
+    $bp->profile->slug = BP_XPROFILE_SLUG;
+
+    $bp->version_numbers->profile = BP_XPROFILE_VERSION;
     
     if ( function_exists('bp_wire_install') )
-        $bp['profile']['table_name_wire'] = $wpdb->base_prefix . 'bp_xprofile_wire';
+        $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire';
 }
 add_action( 'wp', 'xprofile_setup_globals', 1 );    
@@ -189 +187 @@
 
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-    if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['profile']['table_name_groups'] . "%'") == false ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
+    if ( ( $wpdb->get_var("SHOW TABLES LIKE '%{$bp->profile->table_name_groups}%'") == false ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
         xprofile_install();
     
-    if ( ( function_exists('bp_wire_install') && $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['profile']['table_name_wire'] . "%'") == false ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
+    if ( ( function_exists('bp_wire_install') && $wpdb->get_var("SHOW TABLES LIKE '%{$bp->profile->table_name_wire}%'") == false ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
         xprofile_wire_install();
 }
@@ -214 +212 @@
     
     /* Add 'Profile' to the main navigation */
-    bp_core_add_nav_item( __('Profile', 'buddypress'), $bp['profile']['slug'] );
-    bp_core_add_nav_default( $bp['profile']['slug'], 'xprofile_screen_display_profile', 'public' );
-    
-    $profile_link = $bp['loggedin_domain'] . $bp['profile']['slug'] . '/';
+    bp_core_add_nav_item( __('Profile', 'buddypress'), $bp->profile->slug );
+    bp_core_add_nav_default( $bp->profile->slug, 'xprofile_screen_display_profile', 'public' );
+    
+    $profile_link = $bp->loggedin_user->domain . $bp->profile->slug . '/';
     
     /* Add the subnav items to the profile */
-    bp_core_add_subnav_item( $bp['profile']['slug'], 'public', __('Public', 'buddypress'), $profile_link, 'xprofile_screen_display_profile' );
-    bp_core_add_subnav_item( $bp['profile']['slug'], 'edit', __('Edit Profile', 'buddypress'), $profile_link, 'xprofile_screen_edit_profile' );
-    bp_core_add_subnav_item( $bp['profile']['slug'], 'change-avatar', __('Change Avatar', 'buddypress'), $profile_link, 'xprofile_screen_change_avatar' );
-
-    if ( $bp['current_component'] == $bp['profile']['slug'] ) {
+    bp_core_add_subnav_item( $bp->profile->slug, 'public', __('Public', 'buddypress'), $profile_link, 'xprofile_screen_display_profile' );
+    bp_core_add_subnav_item( $bp->profile->slug, 'edit', __('Edit Profile', 'buddypress'), $profile_link, 'xprofile_screen_edit_profile' );
+    bp_core_add_subnav_item( $bp->profile->slug, 'change-avatar', __('Change Avatar', 'buddypress'), $profile_link, 'xprofile_screen_change_avatar' );
+
+    if ( $bp->current_component == $bp->profile->slug ) {
         if ( bp_is_home() ) {
-            $bp['bp_options_title'] = __('My Profile', 'buddypress');
+            $bp->bp_options_title = __('My Profile', 'buddypress');
         } else {
-            $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
-            $bp['bp_options_title'] = $bp['current_fullname']; 
+            $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
+            $bp->bp_options_title = $bp->displayed_user->fullname; 
         }
     }
@@ -254 +252 @@
     // logged in user. $is_new_friend is set in bp-core/bp-core-catchuri.php in bp_core_set_uri_globals()
     if ( $is_new_friend )
-        bp_core_delete_notifications_for_user_by_item_id( $bp['loggedin_userid'], $bp['current_userid'], 'friends', 'friendship_accepted' );
+        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', $is_new_friend );
@@ -307 +305 @@
 function xprofile_screen_notification_settings() { 
     global $current_user; ?>
+    <?php if ( function_exists('bp_wire_install') ) { ?>
     <table class="notification-settings" id="profile-notification-settings">
         <tr>
@@ -314 +313 @@
             <th class="no"><?php _e( 'No', 'buddypress' )?></th>
         </tr>
-        <?php if ( function_exists('bp_wire_install') ) { ?>
+
         <tr>
             <td></td>
@@ -321 +320 @@
             <td class="no"><input type="radio" name="notifications[notification_profile_wire_post]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_profile_wire_post' ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
-        <?php } ?>
         
         <?php do_action( 'xprofile_screen_notification_settings' ) ?>
     </table>
+    <?php } ?>
 <?php   
 }
@@ -346 +345 @@
     global $bp;
     
-    if ( 'delete-avatar' != $bp['current_action'] )
+    if ( 'delete-avatar' != $bp->current_action )
         return false;
     
@@ -371 +370 @@
     global $bp;
     
-    if ( $bp['current_component'] != $bp['wire']['slug'] )
+    if ( $bp->current_component != $bp->wire->slug )
         return false;
     
-    if ( 'post' != $bp['current_action'] )
+    if ( 'post' != $bp->current_action )
         return false;
     
-    if ( !$wire_post_id = bp_wire_new_post( $bp['current_userid'], $_POST['wire-post-textarea'], $bp['profile']['slug'], false, $bp['profile']['table_name_wire'] ) ) {
+    if ( !$wire_post_id = 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 {
@@ -385 +384 @@
     }
 
-    if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-        bp_core_redirect( $bp['current_domain'] );
+    if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
+        bp_core_redirect( $bp->displayed_user->domain );
     } else {
-        bp_core_redirect( $bp['current_domain'] . $bp['wire']['slug'] );
+        bp_core_redirect( $bp->displayed_user->domain . $bp->wire->slug );
     }
 }
@@ -408 +407 @@
     global $bp;
     
-    if ( $bp['current_component'] != $bp['wire']['slug'] )
+    if ( $bp->current_component != $bp->wire->slug )
         return false;
     
-    if ( $bp['current_action'] != 'delete' )
+    if ( $bp->current_action != 'delete' )
         return false;
             
-    $wire_post_id = $bp['action_variables'][0];
-    
-    if ( bp_wire_delete_post( $wire_post_id, $bp['profile']['slug'], $bp['profile']['table_name_wire'] ) ) {
+    $wire_post_id = $bp->action_variables[0];
+    
+    if ( bp_wire_delete_post( $wire_post_id, $bp->profile->slug, $bp->profile->table_name_wire ) ) {
         bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
 
@@ -424 +423 @@
     }
     
-    if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-        bp_core_redirect( $bp['current_domain'] );
+    if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
+        bp_core_redirect( $bp->displayed_user->domain );
     } else {
-        bp_core_redirect( $bp['current_domain']. $bp['wire']['slug'] );
+        bp_core_redirect( $bp->displayed_user->domain. $bp->wire->slug );
     }
 }
@@ -499 +498 @@
         case 'new_wire_post':
             if ( class_exists('BP_Wire_Post') ) {
-                $wire_post = new BP_Wire_Post( $bp['profile']['table_name_wire'], $item_id );
+                $wire_post = new BP_Wire_Post( $bp->profile->table_name_wire, $item_id );
             }
             
@@ -505 +504 @@
                 return false;
             
-            if ( ( $wire_post->item_id == $bp['loggedin_userid'] && $wire_post->user_id == $bp['loggedin_userid'] ) || ( $wire_post->item_id == $bp['current_userid'] && $wire_post->user_id == $bp['current_userid'] ) ) {
+            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);
@@ -513 +512 @@
                 $return_values['primary_link'] = bp_core_get_userlink( $wire_post->user_id, false, true );
             
-            } else if ( ( $wire_post->item_id != $bp['loggedin_userid'] && $wire_post->user_id == $bp['loggedin_userid'] ) || ( $wire_post->item_id != $bp['current_userid'] && $wire_post->user_id == $bp['current_userid'] ) ) {
+            } 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);
@@ -546 +545 @@
             return array( 
                 'primary_link' => bp_core_get_userlink( $user_id, false, true ),
-                'content' => apply_filters( 'xprofile_updated_profile_activity', sprintf( __('%s updated the "%s" information on their profile', 'buddypress'), $user_link, '<a href="' . $bp['current_domain'] . $bp['profile']['slug'] . '">' . $profile_group->name . '</a>' ) . ' <span class="time-since">%s</span>', $user_link, $profile_group->name )
+                'content' => apply_filters( 'xprofile_updated_profile_activity', sprintf( __('%s updated the "%s" information on their profile', 'buddypress'), $user_link, '<a href="' . $bp->displayed_user->domain . $bp->profile->slug . '">' . $profile_group->name . '</a>' ) . ' <span class="time-since">%s</span>', $user_link, $profile_group->name )
             );
         break;
@@ -574 +573 @@
     if ( $action == 'new_wire_post') {
         if ( (int)$total_items > 1 ) {
-            return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp['loggedin_domain'] . $bp['wire']['slug'] . '" title="Wire">' . sprintf( __('You have %d new posts on your wire'), (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">' . sprintf( __('You have %d new posts on your wire'), (int)$total_items ) . '</a>', $total_items );      
         } else {
             $user_fullname = bp_core_global_user_fullname( $item_id );
-            return apply_filters( 'bp_xprofile_single_new_wire_post_notification', '<a href="' . $bp['loggedin_domain'] . $bp['wire']['slug'] . '" title="Wire">' . sprintf( __('%s posted on your wire'), $user_fullname ) . '</a>', $user_fullname );
+            return apply_filters( 'bp_xprofile_single_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="Wire">' . sprintf( __('%s posted on your wire'), $user_fullname ) . '</a>', $user_fullname );
         }
     }
@@ -647 +646 @@
                         // If the field is required and has been left blank then we need to add a callback error.
                         if ( ( $field->is_required && !isset($current_field) ) ||
-                             ( $field->is_required && $current_field == '' ) ) {
+                             ( $field->is_required && empty( $current_field ) ) ) {
                             
                             // Add the error message to the errors array
@@ -655 +654 @@
                         // If the field is not required and the field has been left blank, delete any values for the
                         // field from the database.
-                        } else if ( !$field->is_required && ( $current_field == '' || is_null($current_field) ) ) {
+                        } else if ( !$field->is_required && ( empty( $current_field ) || is_null($current_field) ) ) {
                             
                             // Create a new profile data object for the logged in user based on field ID.                               
@@ -795 +794 @@
     $field_data[0]->value = xprofile_format_profile_field( $field_data[0]->type, $field_data[0]->value );
     
-    if ( !$field_data[0]->value || $field_data[0]->value == '' )
+    if ( !$field_data[0]->value || empty( $field_data[0]->value ) )
         return false;
     
@@ -813 +812 @@
  */
 function xprofile_format_profile_field( $field_type, $field_value ) {
-    if ( !isset($field_value) || $field_value == '' )
+    if ( !isset($field_value) || empty( $field_value ) )
         return false;
     

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

@@ -98 +98 @@
                                     <td><span title="<?php echo $field->desc; ?>"><?php echo $field->name; ?> <?php if(!$field->can_delete) { ?>(Core)<?php } ?></span></td>
                                     <td><?php echo $field->type; ?></td>
-                                    <td style="text-align:center;"><?php if ( $field->is_required ) { echo '<img src="' . $bp['profile']['image_base'] . '/tick.gif" alt="Yes" />'; } else { ?>--<?php } ?></td>
+                                    <td style="text-align:center;"><?php if ( $field->is_required ) { echo '<img src="' . $bp->profile->image_base . '/tick.gif" alt="Yes" />'; } else { ?>--<?php } ?></td>
                                     <td style="text-align:center;"><?php if ( !$field->can_delete ) { ?><strike><?php _e( 'Edit', 'buddypress' ) ?></strike><?php } else { ?><a class="edit" href="admin.php?page=xprofile_settings&amp;group_id=<?php echo $groups[$i]->id; ?>&amp;field_id=<?php echo $field->id; ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ) ?></a><?php } ?></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=xprofile_settings&amp;field_id=<?php echo $field->id; ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ) ?></a><?php } ?></td>

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

@@ -29 +29 @@
         global $wpdb, $bp;
         
-        $sql = $wpdb->prepare("SELECT * FROM " . $bp['profile']['table_name_groups'] . " WHERE id = %d", $id);
+        $sql = $wpdb->prepare("SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id);
 
         if ( $group = $wpdb->get_row($sql) ) {
@@ -47 +47 @@
 
         if ( $this->id != null ) {
-            $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("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);     
         }
         
@@ -64 +64 @@
             return false;
         
-        $sql = $wpdb->prepare("DELETE FROM " . $bp['profile']['table_name_groups'] . " WHERE id = %d", $this->id);
+        $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id );
 
         if ( $wpdb->query($sql) === false) {
@@ -85 +85 @@
 
         // Get field ids for the current group.
-        $sql = $wpdb->prepare("SELECT id, type FROM " . $bp['profile']['table_name_fields'] . " WHERE group_id = %d AND parent_id = 0 ORDER BY id", $this->id);
+        $sql = $wpdb->prepare("SELECT id, type FROM {$bp->profile->table_name_fields} WHERE group_id = %d AND parent_id = 0 ORDER BY id", $this->id);
 
         if(!$fields = $wpdb->get_results($sql))         
@@ -143 +143 @@
 
         if ( $hide_empty ) {
-            $sql = $wpdb->prepare("SELECT DISTINCT g.* FROM " . $bp['profile']['table_name_groups'] . " g INNER JOIN " . $bp['profile']['table_name_fields'] . " f ON g.id = f.group_id ORDER BY g.id ASC");
-        } else {
-            $sql = $wpdb->prepare("SELECT * FROM " . $bp['profile']['table_name_groups'] . " ORDER BY id ASC");
+            $sql = $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id ORDER BY g.id ASC" );
+        } else {
+            $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} ORDER BY id ASC" );
         }
 
@@ -163 +163 @@
         
         // Validate Form
-        if ( $_POST['group_name'] == '' ) {
+        if ( empty( $_POST['group_name'] ) ) {
             $message = __('Please make sure you give the group a name.', 'buddypress');
             return false;
@@ -204 +204 @@
         }
         
-        $sql = $wpdb->prepare("SELECT * FROM " . $bp['profile']['table_name_fields'] . " WHERE id = %d", $id);
+        $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $id );
     
         if ( $field = $wpdb->get_row($sql) ) {
@@ -233 +233 @@
             return false;
             
-        $sql = $wpdb->prepare("DELETE FROM " . $bp['profile']['table_name_fields'] . " WHERE id = %d OR parent_id = %d", $this->id, $this->id);
+        $sql = $wpdb->prepare("DELETE FROM {$bp->profile->table_name_fields} WHERE id = %d OR parent_id = %d", $this->id, $this->id );
 
         if ( $wpdb->query($sql) === false )
@@ -248 +248 @@
         
         if ( $this->id != null ) {
-            $sql = $wpdb->prepare("UPDATE " . $bp['profile']['table_name_fields'] . " SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, is_public = %d, order_by = %s WHERE id = %d", $this->group_id, $this->type, $this->name, $this->desc, $this->is_required, $this->is_public, $this->order_by, $this->id);
-        } else {
-            $sql = $wpdb->prepare("INSERT INTO " . $bp['profile']['table_name_fields'] . " (group_id, parent_id, type, name, description, is_required, is_public, order_by) VALUES (%d, 0, %s, %s, %s, %d, %d, %s)", $this->group_id, $this->type, $this->name, $this->desc, $this->is_required, $this->is_public, $this->order_by);
+            $sql = $wpdb->prepare("UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, is_public = %d, order_by = %s WHERE id = %d", $this->group_id, $this->type, $this->name, $this->desc, $this->is_required, $this->is_public, $this->order_by, $this->id);
+        } else {
+            $sql = $wpdb->prepare("INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, is_public, order_by) VALUES (%d, 0, %s, %s, %s, %d, %d, %s)", $this->group_id, $this->type, $this->name, $this->desc, $this->is_required, $this->is_public, $this->order_by);
         }
         if ( $wpdb->query($sql) !== false ) {
@@ -298 +298 @@
                                 
                             if ( $num > 0 ) {
-                                $sql = $wpdb->prepare( "INSERT INTO " . $bp['profile']['table_name_fields'] . " (group_id, parent_id, type, name, description, is_required, option_order) VALUES (%d, %d, 'option', %s, %s, 0, %d)", $this->group_id, $parent_id, $name, $description, $option_order);
+                                $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, option_order) VALUES (%d, %d, 'option', %s, %s, 0, %d)", $this->group_id, $parent_id, $name, $description, $option_order);
                                 $wpdb->query($sql);
                             }
@@ -334 +334 @@
                             if ( $option_value != "" ) { 
                                 // don't insert an empty option.
-                                $sql = $wpdb->prepare("INSERT INTO " . $bp['profile']['table_name_fields'] . " (group_id, parent_id, type, name, description, is_required, option_order, is_default_option) VALUES (%d, %d, 'option', %s, '', 0, %d, %d)", $this->group_id, $parent_id, $option_value, $counter, $is_default);
+                                $sql = $wpdb->prepare("INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, option_order, is_default_option) VALUES (%d, %d, 'option', %s, '', 0, %d, %d)", $this->group_id, $parent_id, $option_value, $counter, $is_default);
 
                                 if ( $wpdb->query($sql) === false ) {
@@ -464 +464 @@
                 
                 if ( !$this->is_required ) {
-                    $html .= '<a class="clear-value" style="text-decoration: none;" href="javascript:clear(\'field_' . $this->id . '\');"><img src="' . $bp['profile']['image_base'] . '/cross.gif" alt="Clear" /> Clear</a>';
+                    $html .= '<a class="clear-value" style="text-decoration: none;" href="javascript:clear(\'field_' . $this->id . '\');"><img src="' . $bp->profile->image_base . '/cross.gif" alt="Clear" /> Clear</a>';
                 }
                 
@@ -596 +596 @@
         }
         
-        $sql = $wpdb->prepare( "SELECT * FROM " . $bp['profile']['table_name_fields'] . " WHERE parent_id = %d AND group_id = %d $sort_sql", $parent_id, $this->group_id );
+        $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE parent_id = %d AND group_id = %d $sort_sql", $parent_id, $this->group_id );
 
         if ( !$children = $wpdb->get_results($sql) )
@@ -607 +607 @@
         global $wpdb, $bp;
 
-        $sql = $wpdb->prepare("DELETE FROM " . $bp['profile']['table_name_fields'] . " WHERE parent_id = %d", $this->id);
+        $sql = $wpdb->prepare("DELETE FROM {$bp->profile->table_name_fields} WHERE parent_id = %d", $this->id);
 
         $wpdb->query($sql);
@@ -738 +738 @@
                 <p class="submit">
                         &nbsp;<input type="submit" value="<?php _e("Save", 'buddypress') ?> &raquo;" name="saveField" id="saveField" style="font-weight: bold" />
-                         <?php _e('or', 'buddypress') ?> <a href="admin.php?page=xprofile_settings" style="color: red"><?php _e('Cancel', 'buddypress') ?></a>
+                         <?php _e('or', 'buddypress') ?> <a href="admin.php?page=xprofile_settings" style="color: red"><?php _e( 'Cancel', 'buddypress' ) ?></a>
                 </p>
             
@@ -751 +751 @@
         <div class="clear">&nbsp;</div><br />
         
-        <h2>Add Prebuilt Field</h2>
+        <h2><?php _e( 'Add Prebuilt Field', 'buddypress' ) ?></h2>
         <?php $this->render_prebuilt_fields(); ?>
         
@@ -894 +894 @@
         global $wpdb, $bp;
         
-        $sql = $wpdb->prepare("SELECT f.id FROM " . $bp['profile']['table_name_fields'] . " AS f, " . $bp['profile']['table_name_groups'] . " AS g WHERE g.name = %s AND f.parent_id = 0    AND g.id = f.group_id ORDER BY f.id", get_site_option('bp-xprofile-base-group-name') );
+        $sql = $wpdb->prepare( "SELECT f.id FROM {$bp->profile->table_name_fields} AS f, {$bp->profile->table_name_groups} AS g WHERE g.name = %s AND f.parent_id = 0   AND g.id = f.group_id ORDER BY f.id", get_site_option('bp-xprofile-base-group-name') );
 
         if ( !$temp_fields = $wpdb->get_results($sql) )
@@ -910 +910 @@
         
         // Validate Form
-        if ( $_POST['title'] == '' || $_POST['required'] == '' || $_POST['fieldtype'] == '' ) {
+        if ( empty( $_POST['title'] ) || empty( $_POST['required'] ) || empty( $_POST['fieldtype'] ) ) {
             $message = __('Please make sure you fill out all required fields.', 'buddypress');
             return false;
@@ -934 +934 @@
 
         if ( $field_id ) {
-            $sql = $wpdb->prepare("SELECT type FROM " . $bp['profile']['table_name_fields'] . " WHERE id = %d", $field_id);
+            $sql = $wpdb->prepare( "SELECT type FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id );
 
             if ( !$field_type = $wpdb->get_var($sql) )
@@ -949 +949 @@
 
         if ( $group_id ) {
-            $sql = $wpdb->prepare("DELETE FROM " . $bp['profile']['table_name_fields'] . " WHERE group_id = %d", $group_id);
+            $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_fields} WHERE group_id = %d", $group_id );
 
             if ( $wpdb->get_var($sql) === false ) {
@@ -982 +982 @@
             $user_id = $userdata->ID;
         
-        $sql = $wpdb->prepare("SELECT * FROM " . $bp['profile']['table_name_data'] . " WHERE field_id = %d AND user_id = %d", $field_id, $user_id);
+        $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
 
         if ( $profiledata = $wpdb->get_row($sql) ) {
@@ -997 +997 @@
         
         // check to see if there is data already for the user.
-        $sql = $wpdb->prepare("SELECT id FROM " . $bp['profile']['table_name_data'] . " WHERE user_id = %d AND field_id = %d", $userdata->ID, $this->field_id);
+        $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = %d", $userdata->ID, $this->field_id );
 
         if ( !$wpdb->get_row($sql) ) 
@@ -1009 +1009 @@
         
         // check to see if this data is actually for a valid field.
-        $sql = $wpdb->prepare("SELECT id FROM " . $bp['profile']['table_name_fields'] . " WHERE id = %d", $this->field_id);
+        $sql = $wpdb->prepare("SELECT id FROM {$bp->profile->table_name_fields} WHERE id = %d", $this->field_id );
 
         if ( !$wpdb->get_row($sql) ) 
@@ -1024 +1024 @@
         if ( $this->is_valid_field() ) {
             if ( $this->exists() && $this->value != '' ) {
-                $sql = $wpdb->prepare("UPDATE " . $bp['profile']['table_name_data'] . " SET value = %s, last_updated = %s WHERE user_id = %d AND field_id = %d", $this->value, $this->last_updated, $this->user_id, $this->field_id);
-            } else if ( $this->exists() and $this->value == '' ) {
+                $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_data} SET value = %s, last_updated = %s WHERE user_id = %d AND field_id = %d", $this->value, $this->last_updated, $this->user_id, $this->field_id );
+            } else if ( $this->exists() && empty( $this->value ) ) {
                 // Data removed, delete the entry.
                 $this->delete();
             } else {
-                $sql = $wpdb->prepare("INSERT INTO " . $bp['profile']['table_name_data'] . " (user_id, field_id, value, last_updated) VALUES (%d, %d, %s, %s)", $this->user_id, $this->field_id, $this->value, $this->last_updated);
+                $sql = $wpdb->prepare("INSERT INTO {$bp->profile->table_name_data} (user_id, field_id, value, last_updated) VALUES (%d, %d, %s, %s)", $this->user_id, $this->field_id, $this->value, $this->last_updated );
             }
                         
@@ -1047 +1047 @@
         global $wpdb, $bp;
         
-        $sql = $wpdb->prepare("DELETE FROM " . $bp['profile']['table_name_data'] . " WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id);
+        $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id );
 
         if ( $wpdb->query($sql) === false )
@@ -1061 +1061 @@
 
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
-
-        $sql = $wpdb->prepare("SELECT * FROM " . $bp['profile']['table_name_data'] . " WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
+            $user_id = $bp->displayed_user->id;
+
+        $sql = $wpdb->prepare("SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
 
         if ( $profile_data = $wpdb->get_row($sql) ) {
@@ -1079 +1079 @@
 
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
-        
-        if ( !$bp['profile'] )
+            $user_id = $bp->displayed_user->id;
+        
+        if ( !$bp->profile )
             xprofile_setup_globals();
         
@@ -1099 +1099 @@
         }
 
-        $sql = $wpdb->prepare( "SELECT d.value, f.name FROM " . $bp['profile']['table_name_data'] . " d, " . $bp['profile']['table_name_fields'] . " f WHERE d.field_id = f.id AND d.user_id = %d AND f.parent_id = 0 $field_sql", $user_id );
+        $sql = $wpdb->prepare( "SELECT d.value, f.name FROM {$bp->profile->table_name_data} d, {$bp->profile->table_name_fields} f WHERE d.field_id = f.id AND d.user_id = %d AND f.parent_id = 0 $field_sql", $user_id );
 
         if ( !$values = $wpdb->get_results($sql) )
@@ -1126 +1126 @@
         global $wpdb, $userdata, $bp;
 
-        $sql = $wpdb->prepare("DELETE FROM " . $bp['profile']['table_name_data'] . " WHERE field_id = %d", $field_id);
+        $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d", $field_id );
 
         if ( $wpdb->query($sql) === false )
@@ -1137 +1137 @@
         global $wpdb, $bp;
         
-        $last_updated = $wpdb->get_var( $wpdb->prepare( "SELECT last_updated FROM " . $bp['profile']['table_name_data'] . " WHERE user_id = %d ORDER BY last_updated LIMIT 1", $user_id ) );
+        $last_updated = $wpdb->get_var( $wpdb->prepare( "SELECT last_updated FROM {$bp->profile->table_name_data} WHERE user_id = %d ORDER BY last_updated LIMIT 1", $user_id ) );
         
         return $last_updated;
@@ -1145 +1145 @@
         global $wpdb, $bp;
         
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['profile']['table_name_data'] . " WHERE user_id = %d", $user_id ) );  
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE user_id = %d", $user_id ) );    
     }
     
@@ -1154 +1154 @@
             $exclude_sql = $wpdb->prepare( " AND pf.id != 1" );
                 
-        return $wpdb->get_results( $wpdb->prepare( "SELECT pf.type, pf.name, pd.value FROM " . $bp['profile']['table_name_data'] . " pd INNER JOIN " . $bp['profile']['table_name_fields'] . " pf ON pd.field_id = pf.id AND pd.user_id = %d {$exclude_sql} ORDER BY RAND() LIMIT 1", $user_id ) );         
+        return $wpdb->get_results( $wpdb->prepare( "SELECT pf.type, pf.name, pd.value FROM {$bp->profile->table_name_data} pd INNER JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id AND pd.user_id = %d {$exclude_sql} ORDER BY RAND() LIMIT 1", $user_id ) );         
     }
     
@@ -1161 +1161 @@
 
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
+            $user_id = $bp->displayed_user->id;
 
         $data = bp_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );

trunk/bp-xprofile/bp-xprofile-cssjs.php

@@ -37 +37 @@
     global $bp;
 
-    if ( $_SERVER['SCRIPT_NAME'] == '/wp-activate.php' || $bp['current_component'] == ACTIVATION_SLUG || $bp['current_action'] == 'change-avatar' ) {
+    if ( $_SERVER['SCRIPT_NAME'] == '/wp-activate.php' || $bp->current_component == ACTIVATION_SLUG || $bp->current_action == 'change-avatar' ) {
         //wp_enqueue_script('jquery');
         //wp_enqueue_script('prototype');

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -17 +17 @@
 
 function xprofile_filter_format_field_value( $field_value, $field_type ) {
-    if ( !isset($field_value) || $field_value == '' )
+    if ( !isset($field_value) || empty( $field_value ) )
         return false;
 

trunk/bp-xprofile/bp-xprofile-notifications.php

@@ -22 +22 @@
     global $bp, $current_user;
     
-    if ( $bp['current_component'] == $bp['wire']['slug'] && !bp_is_home() ) {
+    if ( $bp->current_component == $bp->wire->slug && !bp_is_home() ) {
         bp_core_add_notification( $poster_id, $user_id, 'xprofile', 'new_wire_post' );
 
-        if ( !get_usermeta( $bp['loggedin_userid'], 'notification_profile_wire_post' ) || get_usermeta( $bp['loggedin_userid'], 'notification_profile_wire_post' ) == 'yes' ) {
+        if ( !get_usermeta( $bp->loggedin_user->id, 'notification_profile_wire_post' ) || get_usermeta( $bp->loggedin_user->id, 'notification_profile_wire_post' ) == 'yes' ) {
             $poster_name = bp_fetch_user_fullname( $poster_id, false );
-            $wire_post = new BP_Wire_Post( $bp['profile']['table_name_wire'], $wire_post_id, true );
+            $wire_post = new BP_Wire_Post( $bp->profile->table_name_wire, $wire_post_id, true );
             $ud = get_userdata($user_id);
             

trunk/bp-xprofile/bp-xprofile-signup.php

@@ -130 +130 @@
             );
             
-            if ( $field->is_required && $value == '' ) {
+            if ( $field->is_required && empty( $value ) ) {
                 $bp_xprofile_callback[$counter]["error_msg"] = $field->name . ' cannot be left blank.';
                 $has_errors = true;
@@ -225 +225 @@
     global $bp;
     
-    if ( $bp['current_component'] != $bp['blogs']['slug'] )
+    if ( $bp->current_component != $bp->blogs->slug )
         return $_SESSION['xprofile_meta'];
     else
@@ -268 +268 @@
     // Loop through each bit of profile data and save it to profile.
     for ( $i = 0; $i < count($field_ids); $i++ ) {
-        if ( $field_ids[$i] == '' ) continue;
+        if ( empty( $field_ids[$i] ) ) continue;
         
         $field_value = $meta["field_{$field_ids[$i]}"];

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -140 +140 @@
     global $bp, $profile_template;
 
-    $profile_template = new BP_XProfile_Template($bp['current_userid']);
+    $profile_template = new BP_XProfile_Template($bp->displayed_user->id);
     
     return $profile_template->has_groups();
@@ -227 +227 @@
     $groups = BP_XProfile_Group::get_all();
     
-    if ( $group_name == '' )
+    if ( empty( $group_name ) )
         $group_name = bp_profile_group_name(false);
     
@@ -237 +237 @@
         }
 
-        echo '<li' . $selected . '><a href="' . $bp['loggedin_domain'] . $bp['profile']['slug'] . '/edit/group/' . $groups[$i]->id . '">' . $groups[$i]->name . '</a></li>';
+        echo '<li' . $selected . '><a href="' . $bp->loggedin_user->domain . $bp->profile->slug . '/edit/group/' . $groups[$i]->id . '">' . $groups[$i]->name . '</a></li>';
     }
     
@@ -246 +246 @@
     global $bp;
     
-    $group_id = $bp['action_variables'][1];
+    $group_id = $bp->action_variables[1];
     
     if ( !is_numeric( $group_id ) )
@@ -263 +263 @@
     global $bp;
 
-    $group_id = $bp['action_variables'][1];
+    $group_id = $bp->action_variables[1];
 
     if ( !is_numeric( $group_id ) )
         $group_id = 1; // 'Basic' group.
     
-    xprofile_edit( $group_id, $bp['loggedin_domain'] . $bp['profile']['slug'] . '/edit/group/' . $group_id . '/?mode=save' );
+    xprofile_edit( $group_id, $bp->loggedin_user->domain . $bp->profile->slug . '/edit/group/' . $group_id . '/?mode=save' );
 }
 
@@ -274 +274 @@
     global $bp;
      
-    bp_core_avatar_admin( null, $bp['loggedin_domain'] . $bp['profile']['slug'] . '/change-avatar/', $bp['loggedin_domain'] . $bp['profile']['slug'] . '/delete-avatar/' );
+    bp_core_avatar_admin( null, $bp->loggedin_user->domain . $bp->profile->slug . '/change-avatar/', $bp->loggedin_user->domain . $bp->profile->slug . '/delete-avatar/' );
 }
 
@@ -280 +280 @@
     global $bp;
     
-    $last_updated = get_usermeta( $bp['current_userid'], 'profile_last_updated' );
+    $last_updated = get_usermeta( $bp->displayed_user->id, 'profile_last_updated' );
 
     if ( !$last_updated ) {
@@ -294 +294 @@
     ?>
     <div class="generic-button">
-        <a class="edit" title="<?php _e( 'Edit Profile', 'buddypress' ) ?>" href="<?php echo $bp['loggedin_domain'] . $bp['profile']['slug'] ?>/edit"><?php _e( 'Edit Profile', 'buddypress' ) ?></a>
+        <a class="edit" title="<?php _e( 'Edit Profile', 'buddypress' ) ?>" href="<?php echo $bp->loggedin_user->domain . $bp->profile->slug ?>/edit"><?php _e( 'Edit Profile', 'buddypress' ) ?></a>
     </div>
     <?php

trunk/buddypress-theme/buddypress-home/functions.php

@@ -47 +47 @@
     global $bp, $query_string;
     
-    if ( $bp['current_component'] == HOME_BLOG_SLUG  ) {
+    if ( $bp->current_component == HOME_BLOG_SLUG  ) {
         $pos = strpos( $query_string, 'pagename=' . HOME_BLOG_SLUG );
         
@@ -68 +68 @@
     global $bp, $current_blog;
     
-    if ( $bp['current_component'] == REGISTER_SLUG && $bp['current_action'] == '' ) {
+    if ( $bp->current_component == REGISTER_SLUG && $bp->current_action == '' ) {
         bp_core_signup_set_headers();
         bp_core_load_template( 'register', true );
@@ -78 +78 @@
     global $bp, $current_blog;
     
-    if ( $bp['current_component'] == ACTIVATION_SLUG && $bp['current_action'] == '' ) {
+    if ( $bp->current_component == ACTIVATION_SLUG && $bp->current_action == '' ) {
         bp_core_activation_set_headers();
         bp_core_load_template( 'activate', true );

trunk/buddypress-theme/member-themes/buddypress-member/functions.php

@@ -11 +11 @@
     global $bp, $is_single_group;
 
-    if ( !bp_is_home() && $bp['current_component'] == 'profile' || 
-                          $bp['current_component'] == 'blog' || 
-                          $bp['current_component'] == 'friends' || 
-                          $bp['current_component'] == 'blogs' ) {
-        if ( $bp['current_userid'] != $bp['loggedin_userid'] )
+    if ( !bp_is_home() && $bp->current_component == 'profile' || 
+                          $bp->current_component == 'blog' || 
+                          $bp->current_component == 'friends' || 
+                          $bp->current_component == 'blogs' ) {
+        if ( $bp->displayed_user->id != $bp->loggedin_user->id )
             echo ' class="arrow"';
     }
     
-    if ( ( $bp['current_component'] == 'groups' && $is_single_group ) || ( $bp['current_component'] == 'groups' && !bp_is_home() ) )
+    if ( ( $bp->current_component == 'groups' && $is_single_group ) || ( $bp->current_component == 'groups' && !bp_is_home() ) )
         echo ' class="arrow"';  
 }
@@ -26 +26 @@
     global $bp;
 
-    if ( ($bp['current_userid'] != $bp['loggedin_userid']) )
+    if ( ($bp->displayed_user->id != $bp->loggedin_user->id) )
         echo ' class="icons"';
 }