Changeset 1021 for trunk/bp-activity.php

Timestamp:

02/06/2009 03:07:48 AM (17 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

File:

• trunk/bp-activity.php (modified) (14 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;