Changeset 1021 for trunk/bp-wire.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-wire.php (modified) (5 diffs)

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;
         }