Skip to:
Content

BuddyPress.org

Changeset 1021 for trunk/bp-blogs.php


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-blogs.php

    r1017 r1021  
    3131                $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
    3232       
    33         $sql[] = "CREATE TABLE ". $bp['blogs']['table_name'] ." (
     33        $sql[] = "CREATE TABLE {$bp->blogs->table_name} (
    3434                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
    3535                                user_id int(11) NOT NULL,
    … …  
    3939                         ) {$charset_collate};";
    4040
    41         $sql[] = "CREATE TABLE ". $bp['blogs']['table_name_blog_posts'] ." (
     41        $sql[] = "CREATE TABLE {$bp->blogs->table_name_blog_posts} (
    4242                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
    4343                                user_id int(11) NOT NULL,
    … …  
    5050                         ) {$charset_collate};";
    5151
    52         $sql[] = "CREATE TABLE ". $bp['blogs']['table_name_blog_comments'] ." (
     52        $sql[] = "CREATE TABLE {$bp->blogs->table_name_blog_comments} (
    5353                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
    5454                                user_id int(11) NOT NULL,
    … …  
    6363                         ) {$charset_collate};";
    6464       
    65         $sql[] = "CREATE TABLE ". $bp['blogs']['table_name_blogmeta'] ." (
     65        $sql[] = "CREATE TABLE {$bp->blogs->table_name_blogmeta} (
    6666                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
    6767                        blog_id int(11) NOT NULL,
    … …  
    8787                // Import blog titles and descriptions into the blogmeta table 
    8888                if ( get_site_option( 'bp-blogs-version' ) <= '0.1.5' ) {
    89                         $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp['blogs']['table_name'] ) );
     89                        $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp->blogs->table_name ) );
    9090
    9191                        for ( $i = 0; $i < count($blog_ids); $i++ ) {
    … …  
    110110        if ( is_site_admin() ) {
    111111                /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
    112                 if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp['blogs']['table_name'] . "%'") == false ) || ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )  )
     112                if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->blogs->table_name . "%'") == false ) || ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )  )
    113113                        bp_blogs_install();
    114114        }
    … …  
    127127        global $bp, $wpdb;
    128128
    129         $bp['blogs'] = array(
    130                 'table_name' => $wpdb->base_prefix . 'bp_user_blogs',
    131                 'table_name_blog_posts' => $wpdb->base_prefix . 'bp_user_blogs_posts',
    132                 'table_name_blog_comments' => $wpdb->base_prefix . 'bp_user_blogs_comments',
    133                 'table_name_blogmeta' => $wpdb->base_prefix . 'bp_user_blogs_blogmeta',
    134                 'format_activity_function' => 'bp_blogs_format_activity',
    135                 'image_base' => site_url( MUPLUGINDIR . '/bp-groups/images' ),
    136                 'slug'           => BP_BLOGS_SLUG
    137         );
    138        
    139         $bp['version_numbers'][$bp['blogs']['slug']] = BP_BLOGS_VERSION;
    140        
    141         /* Register 'groups' as a root component */
    142         bp_core_add_root_component( $bp['blogs']['slug'] );
     129        $bp->blogs->table_name = $wpdb->base_prefix . 'bp_user_blogs';
     130        $bp->blogs->table_name_blog_posts = $wpdb->base_prefix . 'bp_user_blogs_posts';
     131        $bp->blogs->table_name_blog_comments = $wpdb->base_prefix . 'bp_user_blogs_comments';
     132        $bp->blogs->table_name_blogmeta = $wpdb->base_prefix . 'bp_user_blogs_blogmeta';
     133        $bp->blogs->format_activity_function = 'bp_blogs_format_activity';
     134        $bp->blogs->image_base = site_url( MUPLUGINDIR . '/bp-groups/images' );
     135        $bp->blogs->slug = BP_BLOGS_SLUG;
     136
     137        $bp->version_numbers->blogs = BP_BLOGS_VERSION;
    143138}
    144139add_action( 'wp', 'bp_blogs_setup_globals', 1 );       
    … …  
    155150 *
    156151 * Adds "Blog" to the navigation arrays for the current and logged in user.
    157  * $bp['bp_nav'] represents the main component navigation
    158  * $bp['bp_users_nav'] represents the sub navigation when viewing a users
    159  * profile other than that of the current logged in user.
    160152 *
    161153 * @package BuddyPress Blogs
    … …  
    167159       
    168160        /* Add 'Blogs' to the main navigation */
    169         bp_core_add_nav_item( __('Blogs', 'buddypress'), $bp['blogs']['slug'] );
    170 
    171         if ( $bp['current_userid'] )
    172                 bp_core_add_nav_default( $bp['blogs']['slug'], 'bp_blogs_screen_my_blogs', 'my-blogs' );
    173        
    174         $blogs_link = $bp['loggedin_domain'] . $bp['blogs']['slug'] . '/';
     161        bp_core_add_nav_item( __( 'Blogs', 'buddypress' ), $bp->blogs->slug );
     162
     163        if ( $bp->displayed_user->id )
     164                bp_core_add_nav_default( $bp->blogs->slug, 'bp_blogs_screen_my_blogs', 'my-blogs' );
     165       
     166        $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
    175167       
    176168        /* Add the subnav items to the blogs nav item */
    177         bp_core_add_subnav_item( $bp['blogs']['slug'], 'my-blogs', __('My Blogs', 'buddypress'), $blogs_link, 'bp_blogs_screen_my_blogs', 'my-blogs-list' );
    178         bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-posts', __('Recent Posts', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_posts' );
    179         bp_core_add_subnav_item( $bp['blogs']['slug'], 'recent-comments', __('Recent Comments', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_comments' );
    180         bp_core_add_subnav_item( $bp['blogs']['slug'], 'create-a-blog', __('Create a Blog', 'buddypress'), $blogs_link, 'bp_blogs_screen_create_a_blog' );
     169        bp_core_add_subnav_item( $bp->blogs->slug, 'my-blogs', __('My Blogs', 'buddypress'), $blogs_link, 'bp_blogs_screen_my_blogs', 'my-blogs-list' );
     170        bp_core_add_subnav_item( $bp->blogs->slug, 'recent-posts', __('Recent Posts', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_posts' );
     171        bp_core_add_subnav_item( $bp->blogs->slug, 'recent-comments', __('Recent Comments', 'buddypress'), $blogs_link, 'bp_blogs_screen_recent_comments' );
     172        bp_core_add_subnav_item( $bp->blogs->slug, 'create-a-blog', __('Create a Blog', 'buddypress'), $blogs_link, 'bp_blogs_screen_create_a_blog' );
    181173       
    182174        /* Set up the component options navigation for Blog */
    183         if ( $bp['current_component'] == 'blogs' ) {
     175        if ( $bp->current_component == 'blogs' ) {
    184176                if ( bp_is_home() ) {
    185177                        if ( function_exists('xprofile_setup_nav') ) {
    186                                 $bp['bp_options_title'] = __('My Blogs', 'buddypress');
     178                                $bp->bp_options_title = __('My Blogs', 'buddypress');
    187179                        }
    188180                } else {
    189181                        /* If we are not viewing the logged in user, set up the current users avatar and name */
    190                         $bp['bp_options_avatar'] = bp_core_get_avatar( $bp['current_userid'], 1 );
    191                         $bp['bp_options_title'] = $bp['current_fullname'];
     182                        $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
     183                        $bp->bp_options_title = $bp->displayed_user->fullname;
    192184                }
    193185        }
    … …  
    229221        /* Because blog, comment, and blog post code execution happens before anything else
    230222           we need to manually instantiate the activity component globals */
    231         if ( !$bp['activity'] && function_exists('bp_activity_setup_globals') )
     223        if ( !$bp->activity && function_exists('bp_activity_setup_globals') )
    232224                bp_activity_setup_globals();
    233225
    … …  
    364356       
    365357        if ( !$user_id )
    366                 $user_id = $bp['loggedin_userid'];
     358                $user_id = $bp->loggedin_user->id;
    367359               
    368360        $name = get_blog_option( $blog_id, 'blogname' );
    … …  
    577569       
    578570        // Delete activity stream item
    579         bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => 'blogs', 'component_action' => 'new_blog', 'user_id' => $bp['loggedin_userid'] ) );
     571        bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => 'blogs', 'component_action' => 'new_blog', 'user_id' => $bp->loggedin_user->id ) );
    580572       
    581573        do_action( 'bp_blogs_remove_blog', $blog_id );
    … …  
    635627
    636628        // Delete activity stream item
    637         bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'user_id' => $bp['loggedin_userid'] ) );
     629        bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'component_name' => 'blogs', 'component_action' => 'new_blog_comment', 'user_id' => $bp->loggedin_user->id ) );
    638630
    639631        do_action( 'bp_blogs_remove_comment', $blog_id, $comment_id );
    … …  
    699691        global $bp, $wpdb;
    700692       
    701         if ( $bp['current_component'] == $bp['blogs']['slug'] && isset( $_GET['random-blog'] ) ) {
     693        if ( $bp->current_component == $bp->blogs->slug && isset( $_GET['random-blog'] ) ) {
    702694                $blog = bp_blogs_get_random_blog();
    703695
    … …  
    729721
    730722        if ( !$meta_key ) {
    731                 $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['blogs']['table_name_blogpmeta'] . " WHERE blog_id = %d", $blog_id ) );             
     723                $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->blogs->table_name_blogpmeta . " WHERE blog_id = %d", $blog_id ) );         
    732724        } else if ( !$meta_value ) {
    733                 $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 ) );
     725                $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 ) );
    734726        } else {
    735                 $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['blogs']['table_name_blogmeta'] . " WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
     727                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
    736728        }
    737729       
    … …  
    760752                //      $metas = array($user->$meta_key);
    761753                //else
    762                 $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) );
     754                $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) );
    763755        } else {
    764                 $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp['blogs']['table_name_blogmeta'] . " WHERE blog_id = %d", $blog_id) );
     756                $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id) );
    765757        }
    766758
    … …  
    797789        }
    798790
    799         $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 ) );
     791        $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 ) );
    800792       
    801793        if ( !$cur ) {
    802                 $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 ) );
     794                $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 ) );
    803795        } else if ( $cur->meta_value != $meta_value ) {
    804                 $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 ) );
     796                $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 ) );
    805797        } else {
    806798                return false;
Note: See TracChangeset for help on using the changeset viewer.